X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=e904f88369fff37ed17cc97127e0d4045e5f9817;hb=a91dc4447bb6c6bd8807aaaa4e00af0abe4fa5c7;hp=da390aba108b094edeab72c000760845f8f9caa2;hpb=b63e3bbc18c459073a4b83a26b17c53f34f3dcf2;p=sliver-openvswitch.git diff --git a/lib/automake.mk b/lib/automake.mk index da390aba1..e904f8836 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -1,13 +1,21 @@ -# Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. +# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without warranty of any kind. -noinst_LIBRARIES += lib/libopenvswitch.a +lib_LTLIBRARIES += lib/libopenvswitch.la -lib_libopenvswitch_a_SOURCES = \ +lib_libopenvswitch_la_LIBADD = $(SSL_LIBS) + +if WIN32 +lib_libopenvswitch_la_LIBADD += ${PTHREAD_LIBS} +endif + +lib_libopenvswitch_la_LDFLAGS = -release $(VERSION) + +lib_libopenvswitch_la_SOURCES = \ lib/aes128.c \ lib/aes128.h \ lib/async-append.h \ @@ -17,8 +25,6 @@ lib_libopenvswitch_a_SOURCES = \ lib/bfd.h \ lib/bitmap.c \ lib/bitmap.h \ - lib/bond.c \ - lib/bond.h \ lib/bundle.c \ lib/bundle.h \ lib/byte-order.h \ @@ -31,13 +37,14 @@ lib_libopenvswitch_a_SOURCES = \ lib/command-line.c \ lib/command-line.h \ lib/compiler.h \ + lib/connectivity.c \ + lib/connectivity.h \ lib/coverage.c \ lib/coverage.h \ lib/crc32c.c \ lib/crc32c.h \ lib/csum.c \ lib/csum.h \ - lib/daemon.c \ lib/daemon.h \ lib/dhcp.h \ lib/dummy.c \ @@ -45,6 +52,7 @@ lib_libopenvswitch_a_SOURCES = \ lib/dhparams.h \ lib/dirs.h \ lib/dpif-netdev.c \ + lib/dpif-netdev.h \ lib/dpif-provider.h \ lib/dpif.c \ lib/dpif.h \ @@ -54,6 +62,8 @@ lib_libopenvswitch_a_SOURCES = \ lib/dynamic-string.h \ lib/entropy.c \ lib/entropy.h \ + lib/fat-rwlock.c \ + lib/fat-rwlock.h \ lib/fatal-signal.c \ lib/fatal-signal.h \ lib/flow.c \ @@ -76,7 +86,6 @@ lib_libopenvswitch_a_SOURCES = \ lib/jsonrpc.h \ lib/lacp.c \ lib/lacp.h \ - lib/latch.c \ lib/latch.h \ lib/learn.c \ lib/learn.h \ @@ -131,12 +140,14 @@ lib_libopenvswitch_a_SOURCES = \ lib/ovs-atomic-c11.h \ lib/ovs-atomic-clang.h \ lib/ovs-atomic-flag-gcc4.7+.h \ - lib/ovs-atomic-gcc4+.c \ lib/ovs-atomic-gcc4+.h \ lib/ovs-atomic-gcc4.7+.h \ - lib/ovs-atomic-pthreads.c \ + lib/ovs-atomic-locked.c \ + lib/ovs-atomic-locked.h \ lib/ovs-atomic-pthreads.h \ lib/ovs-atomic.h \ + lib/ovs-rcu.c \ + lib/ovs-rcu.h \ lib/ovs-thread.c \ lib/ovs-thread.h \ lib/ovsdb-data.c \ @@ -173,8 +184,6 @@ lib_libopenvswitch_a_SOURCES = \ lib/shash.h \ lib/simap.c \ lib/simap.h \ - lib/signals.c \ - lib/signals.h \ lib/smap.c \ lib/smap.h \ lib/socket-util.c \ @@ -185,16 +194,14 @@ lib_libopenvswitch_a_SOURCES = \ lib/sset.h \ lib/stp.c \ lib/stp.h \ - lib/stream-fd.c \ lib/stream-fd.h \ lib/stream-provider.h \ lib/stream-ssl.h \ lib/stream-tcp.c \ - lib/stream-unix.c \ lib/stream.c \ lib/stream.h \ + lib/stdio.c \ lib/string.c \ - lib/string.h \ lib/svec.c \ lib/svec.h \ lib/table.c \ @@ -229,30 +236,57 @@ lib_libopenvswitch_a_SOURCES = \ lib/vlog.c \ lib/vlog.h \ lib/vswitch-idl.c \ - lib/vswitch-idl.h + lib/vswitch-idl.h \ + lib/vtep-idl.c \ + lib/vtep-idl.h + +if WIN32 +lib_libopenvswitch_la_SOURCES += \ + lib/daemon-windows.c \ + lib/getopt_long.c \ + lib/getrusage-windows.c \ + lib/latch-windows.c \ + lib/route-table-stub.c \ + lib/strsep.c \ + lib/stream-fd-windows.c +else +lib_libopenvswitch_la_SOURCES += \ + lib/daemon-unix.c \ + lib/latch-unix.c \ + lib/signals.c \ + lib/signals.h \ + lib/stream-fd-unix.c \ + lib/stream-unix.c +endif + +EXTRA_DIST += \ + lib/stdio.h.in \ + lib/string.h.in -nodist_lib_libopenvswitch_a_SOURCES = \ +nodist_lib_libopenvswitch_la_SOURCES = \ lib/dirs.c -CLEANFILES += $(nodist_lib_libopenvswitch_a_SOURCES) +CLEANFILES += $(nodist_lib_libopenvswitch_la_SOURCES) -noinst_LIBRARIES += lib/libsflow.a -lib_libsflow_a_SOURCES = \ +lib_LTLIBRARIES += lib/libsflow.la +lib_libsflow_la_LDFLAGS = -release $(VERSION) +lib_libsflow_la_SOURCES = \ lib/sflow_api.h \ lib/sflow.h \ lib/sflow_agent.c \ lib/sflow_sampler.c \ lib/sflow_poller.c \ lib/sflow_receiver.c -lib_libsflow_a_CFLAGS = $(AM_CFLAGS) +lib_libsflow_la_CPPFLAGS = $(AM_CPPFLAGS) +lib_libsflow_la_CFLAGS = $(AM_CFLAGS) if HAVE_WNO_UNUSED -lib_libsflow_a_CFLAGS += -Wno-unused +lib_libsflow_la_CFLAGS += -Wno-unused endif if HAVE_WNO_UNUSED_PARAMETER -lib_libsflow_a_CFLAGS += -Wno-unused-parameter +lib_libsflow_la_CFLAGS += -Wno-unused-parameter endif -if LINUX_DATAPATH -lib_libopenvswitch_a_SOURCES += \ +if LINUX +lib_libopenvswitch_la_SOURCES += \ lib/dpif-linux.c \ lib/dpif-linux.h \ lib/netdev-linux.c \ @@ -268,19 +302,25 @@ lib_libopenvswitch_a_SOURCES += \ lib/route-table.h endif +if DPDK_NETDEV +lib_libopenvswitch_la_SOURCES += \ + lib/netdev-dpdk.c \ + lib/netdev-dpdk.h +endif + if HAVE_POSIX_AIO -lib_libopenvswitch_a_SOURCES += lib/async-append-aio.c +lib_libopenvswitch_la_SOURCES += lib/async-append-aio.c else -lib_libopenvswitch_a_SOURCES += lib/async-append-null.c +lib_libopenvswitch_la_SOURCES += lib/async-append-null.c endif if ESX -lib_libopenvswitch_a_SOURCES += \ +lib_libopenvswitch_la_SOURCES += \ lib/route-table-stub.c endif if HAVE_IF_DL -lib_libopenvswitch_a_SOURCES += \ +lib_libopenvswitch_la_SOURCES += \ lib/netdev-bsd.c \ lib/rtbsd.c \ lib/rtbsd.h \ @@ -288,8 +328,8 @@ lib_libopenvswitch_a_SOURCES += \ endif if HAVE_OPENSSL -lib_libopenvswitch_a_SOURCES += lib/stream-ssl.c -nodist_lib_libopenvswitch_a_SOURCES += lib/dhparams.c +lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c +nodist_lib_libopenvswitch_la_SOURCES += lib/dhparams.c lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem (echo '#include "lib/dhparams.h"' && \ openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \ @@ -298,7 +338,7 @@ lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp mv lib/dhparams.c.tmp lib/dhparams.c else -lib_libopenvswitch_a_SOURCES += lib/stream-nossl.c +lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c endif EXTRA_DIST += \ @@ -316,6 +356,8 @@ MAN_FRAGMENTS += \ lib/memory-unixctl.man \ lib/ofp-version.man \ lib/ovs.tmac \ + lib/service.man \ + lib/service-syn.man \ lib/ssl-bootstrap.man \ lib/ssl-bootstrap-syn.man \ lib/ssl-peer-ca-cert.man \ @@ -334,7 +376,10 @@ MAN_FRAGMENTS += \ OVSIDL_BUILT += \ $(srcdir)/lib/vswitch-idl.c \ $(srcdir)/lib/vswitch-idl.h \ - $(srcdir)/lib/vswitch-idl.ovsidl + $(srcdir)/lib/vswitch-idl.ovsidl \ + $(srcdir)/lib/vtep-idl.c \ + $(srcdir)/lib/vtep-idl.h \ + $(srcdir)/lib/vtep-idl.ovsidl EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann VSWITCH_IDL_FILES = \ @@ -344,6 +389,14 @@ $(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES) $(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp mv $@.tmp $@ +EXTRA_DIST += $(srcdir)/lib/vtep-idl.ann +VTEP_IDL_FILES = \ + $(srcdir)/vtep/vtep.ovsschema \ + $(srcdir)/lib/vtep-idl.ann +$(srcdir)/lib/vtep-idl.ovsidl: $(VTEP_IDL_FILES) + $(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp + mv $@.tmp $@ + lib/dirs.c: lib/dirs.c.in Makefile ($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \ -e 's,[@]srcdir[@],$(srcdir),g' \ @@ -380,25 +433,3 @@ lib-install-data-local: $(MKDIR_P) $(DESTDIR)$(LOGDIR) $(MKDIR_P) $(DESTDIR)$(DBDIR) -if !USE_LINKER_SECTIONS -# 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` - -lib/coverage.$(OBJEXT): lib/coverage.def -lib/coverage.def: $(DIST_SOURCES) - sed -n 's|^COVERAGE_DEFINE(\([_a-zA-Z0-9]\{1,\}\)).*$$|COVERAGE_COUNTER(\1)|p' $(all_sources) | LC_ALL=C sort -u > $@ -CLEANFILES += lib/coverage.def - -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