r670 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Mon Feb 23 19:36:08 2009
New Revision: 670

Log:
* debian/patches/rules-subdir.patch: Remove fancy subdir rules.
* debian/patches/series: Add new patch.


Added:
   lvm2/trunk/debian/patches/rules-subdir.patch
Modified:
   lvm2/trunk/debian/patches/series

Added: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- (empty file)
+++ lvm2/trunk/debian/patches/rules-subdir.patch	Mon Feb 23 19:36:08 2009
@@ -0,0 +1,150 @@
+--- a/make.tmpl.in
++++ b/make.tmpl.in
+@@ -123,60 +123,26 @@
+ 
+ .PHONY: all install install_cluster pofile distclean clean cflow device-mapper 
+ .PHONY: install_device-mapper
+-.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
+-.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
+-.PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
+-
+-SUBDIRS.device-mapper := $(SUBDIRS:=.device-mapper)
+-SUBDIRS.install := $(SUBDIRS:=.install)
+-SUBDIRS.install_cluster := $(SUBDIRS:=.install_cluster)
+-SUBDIRS.install_device-mapper := $(SUBDIRS:=.install_device-mapper)
+-SUBDIRS.pofile := $(SUBDIRS:=.pofile)
+-SUBDIRS.cflow := $(SUBDIRS:=.cflow)
+-SUBDIRS.clean := $(SUBDIRS:=.clean)
+-SUBDIRS.distclean := $(SUBDIRS:=.distclean)
+ 
+ TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB)
+ 
+-all: $(SUBDIRS) $(TARGETS)
++all: subdirs-all $(TARGETS)
+ 
+-install: all $(SUBDIRS.install)
+-install_cluster: all $(SUBDIRS.install_cluster)
+-install_device-mapper: $(SUBDIRS.install_device-mapper)
+-
+-$(SUBDIRS):
+-	$(MAKE) -C $@
+-
+-$(SUBDIRS.device-mapper):
+-	$(MAKE) -C $(@:.device-mapper=) device-mapper
+-
+-$(SUBDIRS.install): $(SUBDIRS)
+-	$(MAKE) -C $(@:.install=) install
+-
+-$(SUBDIRS.install_cluster): $(SUBDIRS)
+-	$(MAKE) -C $(@:.install_cluster=) install_cluster
+-
+-$(SUBDIRS.install_device-mapper): device-mapper
+-	$(MAKE) -C $(@:.install_device-mapper=) install_device-mapper
+-
+-$(SUBDIRS.clean):
+-	-$(MAKE) -C $(@:.clean=) clean
+-
+-$(SUBDIRS.distclean):
+-	-$(MAKE) -C $(@:.distclean=) distclean
++install: subdirs-install
++install_cluster: subdirs-install_cluster
++install_device-mapper: subdirs-install_device-mapper
++
++subdirs-%:
++	+ at set -e; for subdir in $(SUBDIRS); do \
++		$(MAKE) -C $$subdir $(patsubst subdirs-%,%,$@); \
++	done
+ 
+ ifeq ("@INTL@", "yes")
+-pofile: $(SUBDIRS.pofile) $(POTFILES)
+-
+-$(SUBDIRS.pofile):
+-	$(MAKE) -C $(@:.pofile=) pofile
++pofile: subdirs-pofile $(POTFILES)
+ endif
+ 
+ ifneq ("@CFLOW_CMD@", "")
+-cflow: $(SUBDIRS.cflow)
+-
+-$(SUBDIRS.cflow):
+-	$(MAKE) -C $(@:.cflow=) cflow
++cflow: subdirs-cflow
+ endif
+ 
+ $(TARGETS): $(OBJECTS)
+@@ -223,12 +189,12 @@
+ %.mo: %.po
+ 	$(MSGFMT) -o $@ $<
+ 
+-clean: $(SUBDIRS.clean)
++clean: subdirs-clean
+ 	$(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
+ 	      $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \
+ 	      $(SOURCES:%.c=%.gcda) $(LDDEPS)
+ 
+-distclean: $(SUBDIRS.distclean)
++distclean: subdirs-distclean
+ 	$(RM) -rf $(DISTCLEAN_DIRS)
+ 	$(RM) $(DISTCLEAN_TARGETS) \
+ 	      $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -22,7 +22,7 @@
+   SUBDIRS += po
+ endif
+ 
+-SUBDIRS += lib tools daemons libdm
++SUBDIRS += libdm lib tools daemons
+ 
+ ifeq ($(MAKECMDGOALS),distclean)
+   SUBDIRS += daemons/clvmd \
+@@ -40,36 +40,6 @@
+ 
+ include make.tmpl
+ 
+-libdm: include
+-lib: libdm
+-daemons: lib tools
+-tools: lib device-mapper
+-po: tools daemons
+-
+-libdm.device-mapper: include.device-mapper
+-daemons.device-mapper: libdm.device-mapper
+-tools.device-mapper: libdm.device-mapper
+-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
+-
+-ifeq ("@INTL@", "yes")
+-lib.pofile: include.pofile
+-tools.pofile: lib.pofile
+-daemons.pofile: lib.pofile
+-po.pofile: tools.pofile daemons.pofile
+-pofile: po.pofile
+-endif
+-
+-ifneq ("@CFLOW_CMD@", "")
+-tools.cflow: lib.cflow
+-cflow: tools.cflow
+-endif
+-
+-ifneq ("@CSCOPE_CMD@", "")
+-cscope.out: tools
+-	@CSCOPE_CMD@ -b -R
+-all: cscope.out
+-endif
+-
+ check: all
+ 	$(MAKE) -C test all
+ 
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -48,9 +48,7 @@
+ 
+ .PHONY: man
+ 
+-device-mapper: $(MAN8DM)
+-
+-man: $(MAN5) $(MAN8) $(MAN8CLUSTER)
++man: $(MAN5) $(MAN8) $(MAN8CLUSTER) $(MAN8DM)
+ 
+ $(MAN5) $(MAN8) $(MAN8CLUSTER):	Makefile
+ 

Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series	(original)
+++ lvm2/trunk/debian/patches/series	Mon Feb 23 19:36:08 2009
@@ -9,3 +9,4 @@
 libdm-abi.patch
 libdm-atomic.patch
 dmsetup-export.patch
+rules-subdir.patch