X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rhel%2Fautomake.mk;h=9cd9a415e7ee6aecd3f523f90c524f098cd52f2f;hb=ec988646afe6aee6a63d6894a3e9b50f715d5941;hp=34abe5b9db3df12ab2e5d81ed6aa23fc680313d2;hpb=cbaa4ffe9b72904a7dad8ba23fa13cf2783b26c9;p=sliver-openvswitch.git

diff --git a/rhel/automake.mk b/rhel/automake.mk
index 34abe5b9d..9cd9a415e 100644
--- a/rhel/automake.mk
+++ b/rhel/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -6,27 +6,39 @@
 # without warranty of any kind.
 
 EXTRA_DIST += \
+	rhel/README.RHEL \
 	rhel/automake.mk \
 	rhel/etc_init.d_openvswitch \
 	rhel/etc_logrotate.d_openvswitch \
-	rhel/kmodtool-openvswitch-el5.sh \
-	rhel/openvswitch-kmod-rhel5.spec \
-	rhel/openvswitch-kmod-rhel5.spec.in \
+	rhel/etc_sysconfig_network-scripts_ifdown-ovs \
+	rhel/etc_sysconfig_network-scripts_ifup-ovs \
 	rhel/openvswitch-kmod-rhel6.spec \
 	rhel/openvswitch-kmod-rhel6.spec.in \
+	rhel/openvswitch-kmod.files \
+	rhel/openvswitch-kmod-fedora.spec \
+	rhel/openvswitch-kmod-fedora.spec.in \
 	rhel/openvswitch.spec \
 	rhel/openvswitch.spec.in \
-	rhel/usr_share_openvswitch_scripts_sysconfig.template
+	rhel/openvswitch-fedora.spec \
+	rhel/openvswitch-fedora.spec.in \
+	rhel/usr_share_openvswitch_scripts_sysconfig.template \
+	rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
+	rhel/usr_lib_systemd_system_openvswitch.service \
+	rhel/usr_lib_systemd_system_openvswitch-nonetwork.service
 
-
-$(srcdir)/rhel/openvswitch-kmod-rhel5.spec: rhel/openvswitch-kmod-rhel5.spec.in $(top_builddir)/config.status
-	($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
-		< $(srcdir)/rhel/openvswitch-kmod-rhel5.spec.in > $@
+update_rhel_spec = \
+  ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
+    < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \
+  if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
 
 $(srcdir)/rhel/openvswitch-kmod-rhel6.spec: rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status
-	($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
-		< $(srcdir)/rhel/openvswitch-kmod-rhel6.spec.in > $@
+	$(update_rhel_spec)
+
+$(srcdir)/rhel/openvswitch-kmod-fedora.spec: rhel/openvswitch-kmod-fedora.spec.in $(top_builddir)/config.status
+	$(update_rhel_spec)
 
 $(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config.status
-	($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
-		< $(srcdir)/rhel/openvswitch.spec.in > $@
+	$(update_rhel_spec)
+
+$(srcdir)/rhel/openvswitch-fedora.spec: rhel/openvswitch-fedora.spec.in $(top_builddir)/config.status
+	$(update_rhel_spec)