This creates a linux/Module-openvswitch.mk and a linux/Module-brcompat.mk out of linux/Modules.mk. This makes it easier to subsequently disable building the brcompat module. It's split rather than adding conditionals to the single Modules.mk file because it is used both in automake and build stages which have differing conditional syntax.
Signed-off-by: Chris Wright <[email protected]> --- datapath/Makefile.am | 3 +- datapath/linux/Kbuild.in | 3 +- datapath/linux/Makefile.main.in | 3 +- datapath/linux/Module-brcompat.mk | 3 + datapath/linux/Module-openvswitch.mk | 70 ++++++++++++++++++++++++++++++++ datapath/linux/Modules.mk | 74 ---------------------------------- 6 files changed, 79 insertions(+), 77 deletions(-) create mode 100644 datapath/linux/Module-brcompat.mk create mode 100644 datapath/linux/Module-openvswitch.mk delete mode 100644 datapath/linux/Modules.mk diff --git a/datapath/Makefile.am b/datapath/Makefile.am index 1c9e53b..9b1e5c2 100644 --- a/datapath/Makefile.am +++ b/datapath/Makefile.am @@ -9,7 +9,8 @@ EXTRA_DIST = $(dist_headers) $(dist_sources) $(dist_extras) AUTOMAKE_OPTIONS = -Wno-portability include Modules.mk -include linux/Modules.mk +include linux/Module-openvswitch.mk +include linux/Module-brcompat.mk # The following is based on commands for the Automake "distdir" target. distfiles: Makefile diff --git a/datapath/linux/Kbuild.in b/datapath/linux/Kbuild.in index d82cb00..517e267 100644 --- a/datapath/linux/Kbuild.in +++ b/datapath/linux/Kbuild.in @@ -6,7 +6,8 @@ export VERSION = @VERSION@ export BUILDNR = @BUILDNR@ include $(srcdir)/../Modules.mk -include $(srcdir)/Modules.mk +include $(srcdir)/Module-openvswitch.mk +include $(srcdir)/Module-brcompat.mk EXTRA_CFLAGS := -DVERSION=\"$(VERSION)\" EXTRA_CFLAGS += -I$(srcdir)/.. diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in index b55fc95..ccfb405 100644 --- a/datapath/linux/Makefile.main.in +++ b/datapath/linux/Makefile.main.in @@ -6,7 +6,8 @@ export KSRC = @KBUILD@ export VERSION = @VERSION@ include $(srcdir)/../Modules.mk -include $(srcdir)/Modules.mk +include $(srcdir)/Module-openvswitch.mk +include $(srcdir)/Module-brcompat.mk default: $(build_links) diff --git a/datapath/linux/Module-brcompat.mk b/datapath/linux/Module-brcompat.mk new file mode 100644 index 0000000..bcb4f2b --- /dev/null +++ b/datapath/linux/Module-brcompat.mk @@ -0,0 +1,3 @@ +both_modules += brcompat +brcompat_sources = linux/compat/genetlink-brcompat.c brcompat_main.c +brcompat_headers = diff --git a/datapath/linux/Module-openvswitch.mk b/datapath/linux/Module-openvswitch.mk new file mode 100644 index 0000000..84674ef --- /dev/null +++ b/datapath/linux/Module-openvswitch.mk @@ -0,0 +1,70 @@ +openvswitch_sources += \ + linux/compat/addrconf_core-openvswitch.c \ + linux/compat/dev-openvswitch.c \ + linux/compat/exthdrs_core.c \ + linux/compat/flex_array.c \ + linux/compat/genetlink-openvswitch.c \ + linux/compat/ip_output-openvswitch.c \ + linux/compat/kmemdup.c \ + linux/compat/netdevice.c \ + linux/compat/net_namespace.c \ + linux/compat/reciprocal_div.c \ + linux/compat/skbuff-openvswitch.c \ + linux/compat/time.c \ + linux/compat/workqueue.c +openvswitch_headers += \ + linux/compat/include/linux/checksum.h \ + linux/compat/include/linux/compiler.h \ + linux/compat/include/linux/compiler-gcc.h \ + linux/compat/include/linux/cpumask.h \ + linux/compat/include/linux/dmi.h \ + linux/compat/include/linux/err.h \ + linux/compat/include/linux/etherdevice.h \ + linux/compat/include/linux/flex_array.h \ + linux/compat/include/linux/genetlink.h \ + linux/compat/include/linux/icmp.h \ + linux/compat/include/linux/icmpv6.h \ + linux/compat/include/linux/if.h \ + linux/compat/include/linux/if_arp.h \ + linux/compat/include/linux/if_ether.h \ + linux/compat/include/linux/if_vlan.h \ + linux/compat/include/linux/in.h \ + linux/compat/include/linux/inetdevice.h \ + linux/compat/include/linux/ip.h \ + linux/compat/include/linux/ipv6.h \ + linux/compat/include/linux/jiffies.h \ + linux/compat/include/linux/kernel.h \ + linux/compat/include/linux/kobject.h \ + linux/compat/include/linux/lockdep.h \ + linux/compat/include/linux/log2.h \ + linux/compat/include/linux/mutex.h \ + linux/compat/include/linux/netdevice.h \ + linux/compat/include/linux/netfilter_bridge.h \ + linux/compat/include/linux/netfilter_ipv4.h \ + linux/compat/include/linux/netlink.h \ + linux/compat/include/linux/poison.h \ + linux/compat/include/linux/rculist.h \ + linux/compat/include/linux/rcupdate.h \ + linux/compat/include/linux/reciprocal_div.h \ + linux/compat/include/linux/rtnetlink.h \ + linux/compat/include/linux/skbuff.h \ + linux/compat/include/linux/slab.h \ + linux/compat/include/linux/stddef.h \ + linux/compat/include/linux/tcp.h \ + linux/compat/include/linux/timer.h \ + linux/compat/include/linux/types.h \ + linux/compat/include/linux/u64_stats_sync.h \ + linux/compat/include/linux/udp.h \ + linux/compat/include/linux/workqueue.h \ + linux/compat/include/net/checksum.h \ + linux/compat/include/net/dst.h \ + linux/compat/include/net/genetlink.h \ + linux/compat/include/net/ip.h \ + linux/compat/include/net/ipv6.h \ + linux/compat/include/net/net_namespace.h \ + linux/compat/include/net/netlink.h \ + linux/compat/include/net/protocol.h \ + linux/compat/include/net/route.h \ + linux/compat/include/net/sock.h \ + linux/compat/include/net/netns/generic.h \ + linux/compat/genetlink.inc diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk deleted file mode 100644 index d9a85cc..0000000 --- a/datapath/linux/Modules.mk +++ /dev/null @@ -1,74 +0,0 @@ -openvswitch_sources += \ - linux/compat/addrconf_core-openvswitch.c \ - linux/compat/dev-openvswitch.c \ - linux/compat/exthdrs_core.c \ - linux/compat/flex_array.c \ - linux/compat/genetlink-openvswitch.c \ - linux/compat/ip_output-openvswitch.c \ - linux/compat/kmemdup.c \ - linux/compat/netdevice.c \ - linux/compat/net_namespace.c \ - linux/compat/reciprocal_div.c \ - linux/compat/skbuff-openvswitch.c \ - linux/compat/time.c \ - linux/compat/workqueue.c -openvswitch_headers += \ - linux/compat/include/linux/checksum.h \ - linux/compat/include/linux/compiler.h \ - linux/compat/include/linux/compiler-gcc.h \ - linux/compat/include/linux/cpumask.h \ - linux/compat/include/linux/dmi.h \ - linux/compat/include/linux/err.h \ - linux/compat/include/linux/etherdevice.h \ - linux/compat/include/linux/flex_array.h \ - linux/compat/include/linux/genetlink.h \ - linux/compat/include/linux/icmp.h \ - linux/compat/include/linux/icmpv6.h \ - linux/compat/include/linux/if.h \ - linux/compat/include/linux/if_arp.h \ - linux/compat/include/linux/if_ether.h \ - linux/compat/include/linux/if_vlan.h \ - linux/compat/include/linux/in.h \ - linux/compat/include/linux/inetdevice.h \ - linux/compat/include/linux/ip.h \ - linux/compat/include/linux/ipv6.h \ - linux/compat/include/linux/jiffies.h \ - linux/compat/include/linux/kernel.h \ - linux/compat/include/linux/kobject.h \ - linux/compat/include/linux/lockdep.h \ - linux/compat/include/linux/log2.h \ - linux/compat/include/linux/mutex.h \ - linux/compat/include/linux/netdevice.h \ - linux/compat/include/linux/netfilter_bridge.h \ - linux/compat/include/linux/netfilter_ipv4.h \ - linux/compat/include/linux/netlink.h \ - linux/compat/include/linux/poison.h \ - linux/compat/include/linux/rculist.h \ - linux/compat/include/linux/rcupdate.h \ - linux/compat/include/linux/reciprocal_div.h \ - linux/compat/include/linux/rtnetlink.h \ - linux/compat/include/linux/skbuff.h \ - linux/compat/include/linux/slab.h \ - linux/compat/include/linux/stddef.h \ - linux/compat/include/linux/tcp.h \ - linux/compat/include/linux/timer.h \ - linux/compat/include/linux/types.h \ - linux/compat/include/linux/u64_stats_sync.h \ - linux/compat/include/linux/udp.h \ - linux/compat/include/linux/workqueue.h \ - linux/compat/include/net/checksum.h \ - linux/compat/include/net/dst.h \ - linux/compat/include/net/genetlink.h \ - linux/compat/include/net/ip.h \ - linux/compat/include/net/ipv6.h \ - linux/compat/include/net/net_namespace.h \ - linux/compat/include/net/netlink.h \ - linux/compat/include/net/protocol.h \ - linux/compat/include/net/route.h \ - linux/compat/include/net/sock.h \ - linux/compat/include/net/netns/generic.h \ - linux/compat/genetlink.inc - -both_modules += brcompat -brcompat_sources = linux/compat/genetlink-brcompat.c brcompat_main.c -brcompat_headers = -- 1.7.7.6 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
