vlog: Generate vlog-modules.def automatically.

[sliver-openvswitch.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index 51d3c11..6555661 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -14,8 +14,11 @@ lib_libopenvswitch_a_SOURCES = \
        lib/backtrace.h \
        lib/bitmap.c \
        lib/bitmap.h \
+       lib/byte-order.h \
        lib/byteq.c \
        lib/byteq.h \
+       lib/cfm.c \
+       lib/cfm.h \
        lib/classifier.c \
        lib/classifier.h \
        lib/command-line.c \
@@ -28,19 +31,22 @@ lib_libopenvswitch_a_SOURCES = \
        lib/csum.h \
        lib/daemon.c \
        lib/daemon.h \
+       lib/dummy.c \
+       lib/dummy.h \
        lib/dhcp-client.c \
        lib/dhcp-client.h \
        lib/dhcp.c \
        lib/dhcp.h \
        lib/dhparams.h \
        lib/dirs.h \
-       lib/dpif-linux.c \
        lib/dpif-netdev.c \
        lib/dpif-provider.h \
        lib/dpif.c \
        lib/dpif.h \
        lib/dynamic-string.c \
        lib/dynamic-string.h \
+       lib/entropy.c \
+       lib/entropy.h \
        lib/fatal-signal.c \
        lib/fatal-signal.h \
        lib/flow.c \
@@ -63,14 +69,21 @@ lib_libopenvswitch_a_SOURCES = \
        lib/lockfile.h \
        lib/mac-learning.c \
        lib/mac-learning.h \
-       lib/netdev-linux.c \
+       lib/netdev-dummy.c \
        lib/netdev-provider.h \
        lib/netdev.c \
        lib/netdev.h \
+       lib/nx-match.c \
+       lib/nx-match.def \
+       lib/nx-match.h \
        lib/odp-util.c \
        lib/odp-util.h \
+       lib/ofp-parse.c \
+       lib/ofp-parse.h \
        lib/ofp-print.c \
        lib/ofp-print.h \
+       lib/ofp-util.c \
+       lib/ofp-util.h \
        lib/ofpbuf.c \
        lib/ofpbuf.h \
        lib/ovsdb-data.c \
@@ -102,8 +115,6 @@ lib_libopenvswitch_a_SOURCES = \
        lib/rconn.h \
        lib/reconnect.c \
        lib/reconnect.h \
-       lib/rtnetlink.c \
-       lib/rtnetlink.h \
        lib/sat-math.h \
        lib/sha1.c \
        lib/sha1.h \
@@ -115,8 +126,6 @@ lib_libopenvswitch_a_SOURCES = \
        lib/socket-util.h \
        lib/sort.c \
        lib/sort.h \
-       lib/stp.c \
-       lib/stp.h \
        lib/stream-fd.c \
        lib/stream-fd.h \
        lib/stream-provider.h \
@@ -133,6 +142,7 @@ lib_libopenvswitch_a_SOURCES = \
        lib/timeval.c \
        lib/timeval.h \
        lib/type-props.h \
+       lib/unaligned.h \
        lib/unicode.c \
        lib/unicode.h \
        lib/unixctl.c \
@@ -146,10 +156,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/vconn-stream.c \
        lib/vconn.c \
        lib/vconn.h \
-       lib/vlog-modules.def \
        lib/vlog.c \
-       lib/vlog.h \
-       lib/xtoxll.h
+       lib/vlog.h
 nodist_lib_libopenvswitch_a_SOURCES = \
        lib/coverage-counters.c \
        lib/dirs.c
@@ -167,12 +175,21 @@ lib_libsflow_a_CFLAGS = $(AM_CFLAGS)
 if HAVE_WNO_UNUSED
 lib_libsflow_a_CFLAGS += -Wno-unused
 endif
+if HAVE_WNO_UNUSED_PARAMETER
+lib_libsflow_a_CFLAGS += -Wno-unused-parameter
+endif
 
 if HAVE_NETLINK
 lib_libopenvswitch_a_SOURCES += \
+       lib/dpif-linux.c \
+       lib/netdev-linux.c \
+       lib/netdev-vport.c \
+       lib/netdev-vport.h \
        lib/netlink-protocol.h \
        lib/netlink.c \
-       lib/netlink.h
+       lib/netlink.h \
+       lib/rtnetlink.c \
+       lib/rtnetlink.h
 endif
 
 if HAVE_OPENSSL
@@ -191,7 +208,7 @@ EXTRA_DIST += \
        lib/dh1024.pem \
        lib/dh2048.pem \
        lib/dh4096.pem \
-       lib/dhparams.h
+       lib/dirs.c.in
 
 EXTRA_DIST += \
        lib/common.man \
@@ -205,26 +222,41 @@ EXTRA_DIST += \
        lib/ssl-peer-ca-cert.man \
        lib/ssl.man \
        lib/ssl-syn.man \
+       lib/unixctl.man \
+       lib/unixctl-syn.man \
        lib/vconn-active.man \
        lib/vconn-passive.man \
        lib/vlog-unixctl.man \
        lib/vlog-syn.man \
        lib/vlog.man
 
-
-lib/dirs.c: Makefile
-       ($(ro_c) && \
-        echo 'const char ovs_pkgdatadir[] = "$(pkgdatadir)";' && \
-        echo 'const char ovs_rundir[] = "@RUNDIR@";' && \
-        echo 'const char ovs_logdir[] = "@LOGDIR@";' && \
-        echo 'const char ovs_bindir[] = "$(bindir)";') > lib/dirs.c.tmp
+lib/dirs.c: lib/dirs.c.in Makefile
+       ($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
+               -e 's,[@]srcdir[@],$(srcdir),g' \
+               -e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
+               -e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
+               -e 's,[@]bindir[@],"$(bindir)",g' \
+               -e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
+            > lib/dirs.c.tmp
        mv lib/dirs.c.tmp lib/dirs.c
 
-install-data-local:
+install-data-local: lib-install-data-local
+lib-install-data-local:
        $(MKDIR_P) $(DESTDIR)$(RUNDIR)
        $(MKDIR_P) $(DESTDIR)$(PKIDIR)
        $(MKDIR_P) $(DESTDIR)$(LOGDIR)
 
+# All distributed sources, with names adjust properly for referencing
+# from $(builddir).
+all_sources = \
+       `for file in $(DIST_SOURCES); do \
+               if test -f $$file; then \
+                       echo $$file; \
+               else \
+                       echo $(VPATH)/$$file; \
+               fi; \
+        done`
+
 # All the source files that have coverage counters.
 COVERAGE_FILES = \
        lib/dpif.c \
@@ -241,6 +273,7 @@ COVERAGE_FILES = \
        lib/rconn.c \
        lib/rtnetlink.c \
        lib/stream.c \
+       lib/stream-ssl.c \
        lib/timeval.c \
        lib/unixctl.c \
        lib/util.c \
@@ -253,3 +286,10 @@ lib/coverage-counters.c: $(COVERAGE_FILES) lib/coverage-scan.pl
        (cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_FILES)) > $@.tmp
        mv $@.tmp $@
 EXTRA_DIST += lib/coverage-scan.pl
+
+if !USE_LINKER_SECTIONS
+lib/vlog.$(OBJEXT): lib/vlog-modules.def
+lib/vlog-modules.def: $(DIST_SOURCES)
+       sed -n 's|^VLOG_DEFINE_\(THIS_\)\{0,1\}MODULE(\([_a-zA-Z0-9]\{1,\}\)).*$$|VLOG_MODULE(\2)|p' $(all_sources) | LC_ALL=C sort -u > $@
+CLEANFILES += lib/vlog-modules.def
+endif