X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=8c97100c76f695e14008de8de5796f9a0d85943b;hb=007948177581f3b3dad188221593d0e4bdca6ba0;hp=65556611f48c6739961a14a87fd2bbe0d3386626;hpb=611d30ceb68c8542d11acee8248f66f9485505e9;p=sliver-openvswitch.git diff --git a/lib/automake.mk b/lib/automake.mk index 65556611f..8c97100c7 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010 Nicira Networks, Inc. +# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -10,10 +10,14 @@ noinst_LIBRARIES += lib/libopenvswitch.a lib_libopenvswitch_a_SOURCES = \ lib/aes128.c \ lib/aes128.h \ + lib/autopath.c \ + lib/autopath.h \ lib/backtrace.c \ lib/backtrace.h \ lib/bitmap.c \ lib/bitmap.h \ + lib/bond.c \ + lib/bond.h \ lib/byte-order.h \ lib/byteq.c \ lib/byteq.h \ @@ -26,17 +30,13 @@ lib_libopenvswitch_a_SOURCES = \ lib/compiler.h \ lib/coverage.c \ lib/coverage.h \ - lib/coverage-counters.h \ lib/csum.c \ lib/csum.h \ lib/daemon.c \ lib/daemon.h \ + lib/dhcp.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-netdev.c \ @@ -55,10 +55,14 @@ lib_libopenvswitch_a_SOURCES = \ lib/hash.h \ lib/hmap.c \ lib/hmap.h \ + lib/hmapx.c \ + lib/hmapx.h \ lib/json.c \ lib/json.h \ lib/jsonrpc.c \ lib/jsonrpc.h \ + lib/lacp.c \ + lib/lacp.h \ lib/leak-checker.c \ lib/leak-checker.h \ lib/learning-switch.c \ @@ -69,15 +73,21 @@ lib_libopenvswitch_a_SOURCES = \ lib/lockfile.h \ lib/mac-learning.c \ lib/mac-learning.h \ + lib/multipath.c \ + lib/multipath.h \ lib/netdev-dummy.c \ lib/netdev-provider.h \ lib/netdev.c \ lib/netdev.h \ + lib/netlink.c \ + lib/netlink.h \ lib/nx-match.c \ lib/nx-match.def \ lib/nx-match.h \ lib/odp-util.c \ lib/odp-util.h \ + lib/ofp-errors.c \ + lib/ofp-errors.h \ lib/ofp-parse.c \ lib/ofp-parse.h \ lib/ofp-print.c \ @@ -103,12 +113,8 @@ lib_libopenvswitch_a_SOURCES = \ lib/pcap.h \ lib/poll-loop.c \ lib/poll-loop.h \ - lib/port-array.c \ - lib/port-array.h \ lib/process.c \ lib/process.h \ - lib/queue.c \ - lib/queue.h \ lib/random.c \ lib/random.h \ lib/rconn.c \ @@ -126,6 +132,8 @@ lib_libopenvswitch_a_SOURCES = \ lib/socket-util.h \ lib/sort.c \ lib/sort.h \ + lib/sset.c \ + lib/sset.h \ lib/stream-fd.c \ lib/stream-fd.h \ lib/stream-provider.h \ @@ -134,11 +142,18 @@ lib_libopenvswitch_a_SOURCES = \ lib/stream-unix.c \ lib/stream.c \ lib/stream.h \ + lib/stress.c \ + lib/stress.h \ + lib/string.c \ lib/string.h \ lib/svec.c \ lib/svec.h \ + lib/table.c \ + lib/table.h \ lib/tag.c \ lib/tag.h \ + lib/timer.c \ + lib/timer.h \ lib/timeval.c \ lib/timeval.h \ lib/type-props.h \ @@ -156,10 +171,11 @@ lib_libopenvswitch_a_SOURCES = \ lib/vconn-stream.c \ lib/vconn.c \ lib/vconn.h \ + lib/vlan-bitmap.c \ + lib/vlan-bitmap.h \ lib/vlog.c \ lib/vlog.h nodist_lib_libopenvswitch_a_SOURCES = \ - lib/coverage-counters.c \ lib/dirs.c CLEANFILES += $(nodist_lib_libopenvswitch_a_SOURCES) @@ -182,14 +198,20 @@ endif if HAVE_NETLINK lib_libopenvswitch_a_SOURCES += \ lib/dpif-linux.c \ + lib/dpif-linux.h \ lib/netdev-linux.c \ + lib/netdev-linux.h \ lib/netdev-vport.c \ lib/netdev-vport.h \ lib/netlink-protocol.h \ - lib/netlink.c \ - lib/netlink.h \ + lib/netlink-socket.c \ + lib/netlink-socket.h \ lib/rtnetlink.c \ - lib/rtnetlink.h + lib/rtnetlink.h \ + lib/rtnetlink-link.c \ + lib/rtnetlink-link.h \ + lib/route-table.c \ + lib/route-table.h endif if HAVE_OPENSSL @@ -202,6 +224,8 @@ lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \ | 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 endif EXTRA_DIST += \ @@ -215,13 +239,14 @@ EXTRA_DIST += \ lib/common-syn.man \ lib/daemon.man \ lib/daemon-syn.man \ - lib/dpif.man \ lib/leak-checker.man \ lib/ssl-bootstrap.man \ lib/ssl-bootstrap-syn.man \ lib/ssl-peer-ca-cert.man \ lib/ssl.man \ lib/ssl-syn.man \ + lib/stress-unixctl.man \ + lib/table.man \ lib/unixctl.man \ lib/unixctl-syn.man \ lib/vconn-active.man \ @@ -240,12 +265,21 @@ lib/dirs.c: lib/dirs.c.in Makefile > lib/dirs.c.tmp mv lib/dirs.c.tmp lib/dirs.c +$(srcdir)/lib/ofp-errors.c: \ + include/openflow/openflow.h include/openflow/nicira-ext.h \ + build-aux/extract-ofp-errors + cd $(srcdir)/include && \ + $(PYTHON) ../build-aux/extract-ofp-errors \ + openflow/openflow.h openflow/nicira-ext.h > ../lib/ofp-errors.c +EXTRA_DIST += build-aux/extract-ofp-errors + install-data-local: lib-install-data-local lib-install-data-local: $(MKDIR_P) $(DESTDIR)$(RUNDIR) $(MKDIR_P) $(DESTDIR)$(PKIDIR) $(MKDIR_P) $(DESTDIR)$(LOGDIR) +if !USE_LINKER_SECTIONS # All distributed sources, with names adjust properly for referencing # from $(builddir). all_sources = \ @@ -257,37 +291,16 @@ all_sources = \ fi; \ done` -# All the source files that have coverage counters. -COVERAGE_FILES = \ - lib/dpif.c \ - lib/flow.c \ - lib/lockfile.c \ - lib/hmap.c \ - lib/mac-learning.c \ - lib/netdev.c \ - lib/netdev-linux.c \ - lib/netlink.c \ - lib/odp-util.c \ - lib/poll-loop.c \ - lib/process.c \ - lib/rconn.c \ - lib/rtnetlink.c \ - lib/stream.c \ - lib/stream-ssl.c \ - lib/timeval.c \ - lib/unixctl.c \ - lib/util.c \ - lib/vconn.c \ - ofproto/ofproto.c \ - ofproto/pktbuf.c \ - vswitchd/bridge.c \ - vswitchd/ovs-brcompatd.c -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 +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/stress.$(OBJEXT): lib/stress.def +lib/stress.def: $(DIST_SOURCES) + sed -n '/^STRESS_OPTION(/,/);$$/{s/);$$/)/;p}' $(all_sources) > $@ +CLEANFILES += lib/stress.def -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 > $@