cluster: STABLE32 - build: rename .d files to .Tpo and extend header tracking

Fabio M. Di Nitto fabbione at fedoraproject.org
Tue Aug 14 09:50:12 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=6d6bf99b91ef62d8f095759d5c38cc9da85707e9
Commit:        6d6bf99b91ef62d8f095759d5c38cc9da85707e9
Parent:        d6b5a4aa6eb261ebbf09ff778cd12deaf02c857d
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Tue Aug 14 11:48:52 2012 +0200
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Tue Aug 14 11:48:52 2012 +0200

build: rename .d files to .Tpo and extend header tracking

.Tpo is slightly more standard (as used by autotools) for dependency
tracking.

this also allows to drop .d from .gitignore that was in conflict
with our init.d dirs (finally!)

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 .gitignore                          |    9 +--------
 cman/cman_tool/Makefile             |    2 +-
 cman/daemon/Makefile                |    4 ++--
 cman/notifyd/Makefile               |    2 +-
 cman/qdisk/Makefile                 |    6 +++---
 config/plugins/ldap/Makefile        |    2 +-
 config/plugins/xml/Makefile         |    2 +-
 config/tools/ccs_tool/Makefile      |    2 +-
 config/tools/ldap/Makefile          |    2 +-
 config/tools/ldap/rng2ldif/Makefile |    6 +++---
 configure                           |    2 +-
 dlm/tool/Makefile                   |    2 +-
 fence/fence_node/Makefile           |    2 +-
 fence/fence_tool/Makefile           |    2 +-
 fence/fenced/Makefile               |    2 +-
 group/daemon/Makefile               |    2 +-
 group/dlm_controld/Makefile         |    2 +-
 make/clean.mk                       |    2 +-
 make/libs.mk                        |    2 +-
 rgmanager/src/clulib/Makefile       |    4 ++--
 rgmanager/src/daemons/Makefile      |    6 +++---
 rgmanager/src/utils/Makefile        |   10 +++++-----
 22 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b2a0ed..97d6273 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,8 @@
 make/defines.mk
 .configure.sh
-*.d
 *.o
+*.Tpo
 *.a
 *.so*
 *.lcrso
-*.po
-.*.*o.cmd
-.tmp_versions
-*.ko
-Module.symvers
-modules.order
-*.mod.c
 *.pc
diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile
index 139ac52..77b48db 100644
--- a/cman/cman_tool/Makefile
+++ b/cman/cman_tool/Makefile
@@ -30,4 +30,4 @@ depends:
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/cman/daemon/Makefile b/cman/daemon/Makefile
index 1329de3..a2672e9 100644
--- a/cman/daemon/Makefile
+++ b/cman/daemon/Makefile
@@ -37,5 +37,5 @@ depends:
 
 clean: generalclean 
 
--include $(OBJS1:.o=.d)
--include $(OBJS2:.o=.d)
+-include $(OBJS1:.o=.Tpo)
+-include $(OBJS2:.o=.Tpo)
diff --git a/cman/notifyd/Makefile b/cman/notifyd/Makefile
index b2e5114..5676fe3 100644
--- a/cman/notifyd/Makefile
+++ b/cman/notifyd/Makefile
@@ -34,4 +34,4 @@ depends:
 
 clean: generalclean
 
--include $(OBJS1:.o=.d)
+-include $(OBJS1:.o=.Tpo)
diff --git a/cman/qdisk/Makefile b/cman/qdisk/Makefile
index e3bb5f7..f39c036 100644
--- a/cman/qdisk/Makefile
+++ b/cman/qdisk/Makefile
@@ -47,6 +47,6 @@ depends:
 
 clean: generalclean
 
--include $(OBJS1:.o=.d)
--include $(OBJS2:.o=.d)
--include $(SHAREDOBJS:.o=.d)
+-include $(OBJS1:.o=.Tpo)
+-include $(OBJS2:.o=.Tpo)
+-include $(SHAREDOBJS:.o=.Tpo)
diff --git a/config/plugins/ldap/Makefile b/config/plugins/ldap/Makefile
index 33e907d..c8621ad 100644
--- a/config/plugins/ldap/Makefile
+++ b/config/plugins/ldap/Makefile
@@ -27,4 +27,4 @@ ${TARGET}: ${OBJS}
 
 clean: generalclean 
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/config/plugins/xml/Makefile b/config/plugins/xml/Makefile
index abc5b75..8853317 100644
--- a/config/plugins/xml/Makefile
+++ b/config/plugins/xml/Makefile
@@ -24,4 +24,4 @@ ${TARGET}: ${OBJS}
 
 clean: generalclean 
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/config/tools/ccs_tool/Makefile b/config/tools/ccs_tool/Makefile
index 7ebb24a..223a41f 100644
--- a/config/tools/ccs_tool/Makefile
+++ b/config/tools/ccs_tool/Makefile
@@ -36,4 +36,4 @@ depends:
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/config/tools/ldap/Makefile b/config/tools/ldap/Makefile
index f58c788..1f0da3f 100644
--- a/config/tools/ldap/Makefile
+++ b/config/tools/ldap/Makefile
@@ -27,4 +27,4 @@ ${TARGET}: ${OBJS}
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/config/tools/ldap/rng2ldif/Makefile b/config/tools/ldap/rng2ldif/Makefile
index 75a2b03..54e7556 100644
--- a/config/tools/ldap/rng2ldif/Makefile
+++ b/config/tools/ldap/rng2ldif/Makefile
@@ -41,6 +41,6 @@ ldif-update: all $(SRCDIR)/config/plugins/ldap/ldap-base.csv
 
 clean: generalclean
 
--include $(OBJS1:.o=.d)
--include $(OBJS2:.o=.d)
--include $(SHAREDOBJS:.o=.d)
+-include $(OBJS1:.o=.Tpo)
+-include $(OBJS2:.o=.Tpo)
+-include $(SHAREDOBJS:.o=.Tpo)
diff --git a/configure b/configure
index 4e9bc2a..1e6356e 100755
--- a/configure
+++ b/configure
@@ -317,7 +317,7 @@ if (!$cflags) {
   } else {
     $cflags="${cflags} -O0 -DDEBUG";
   }
-  $cflags="${cflags} -ggdb3 -MMD";
+  $cflags="${cflags} -ggdb3 -MD -MP -MF \$<.Tpo";
 }
 if ($extracflags) {
   $cflags="${cflags} ${extracflags}";
diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile
index 9d75b6c..680cc88 100644
--- a/dlm/tool/Makefile
+++ b/dlm/tool/Makefile
@@ -29,4 +29,4 @@ depends:
 	$(MAKE) -C ../libdlm all
 	$(MAKE) -C ../libdlmcontrol all
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile
index 9b79449..665dd62 100644
--- a/fence/fence_node/Makefile
+++ b/fence/fence_node/Makefile
@@ -32,4 +32,4 @@ depends:
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/fence/fence_tool/Makefile b/fence/fence_tool/Makefile
index dab3e8f..92152fd 100644
--- a/fence/fence_tool/Makefile
+++ b/fence/fence_tool/Makefile
@@ -29,4 +29,4 @@ depends:
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile
index 902c299..6935475 100644
--- a/fence/fenced/Makefile
+++ b/fence/fenced/Makefile
@@ -46,4 +46,4 @@ depends:
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/group/daemon/Makefile b/group/daemon/Makefile
index 36268db..b1a98c5 100644
--- a/group/daemon/Makefile
+++ b/group/daemon/Makefile
@@ -32,4 +32,4 @@ ${TARGET}: ${OBJS}
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index bb5c82e..39c2b74 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -49,4 +49,4 @@ depends:
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/make/clean.mk b/make/clean.mk
index 3b66280..9f81fdd 100644
--- a/make/clean.mk
+++ b/make/clean.mk
@@ -1,5 +1,5 @@
 generalclean:
-	rm -rf *~* *.o *.a *.so *.so.* a.out *.po *.s *.d *.pyc
+	rm -rf *~* *.o *.a *.so *.so.* a.out *.po *.s *.Tpo *.pyc
 	rm -rf core core.* .depend cscope.* *.orig *.rej
 	rm -rf linux .*.o.cmd .*.ko.cmd *.mod.c .tmp_versions
 	rm -rf Module.symvers Module.markers .*.o.d modules.order
diff --git a/make/libs.mk b/make/libs.mk
index 0cd8e82..a4e9a12 100644
--- a/make/libs.mk
+++ b/make/libs.mk
@@ -56,4 +56,4 @@ $(STATICLIB): $(OBJS)
 
 clean: generalclean
 
--include $(OBJS:.o=.d)
+-include $(OBJS:.o=.Tpo)
diff --git a/rgmanager/src/clulib/Makefile b/rgmanager/src/clulib/Makefile
index adb5578..f14acd9 100644
--- a/rgmanager/src/clulib/Makefile
+++ b/rgmanager/src/clulib/Makefile
@@ -37,5 +37,5 @@ ${TARGET2}: ${OBJS2} ${TARGET1}
 
 clean: generalclean
 
--include $(OBJS1:.o=.d)
--include $(OBJS2:.o=.d)
+-include $(OBJS1:.o=.Tpo)
+-include $(OBJS2:.o=.Tpo)
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 43d3377..83bdf93 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -132,6 +132,6 @@ depends:
 clean: generalclean
 	rm -f tests/*.out*
 
--include $(OBJS1:.o=.d)
--include $(OBJS2:.o=.d)
--include $(OBJS3:.o=.d)
+-include $(OBJS1:.o=.Tpo)
+-include $(OBJS2:.o=.Tpo)
+-include $(OBJS3:.o=.Tpo)
diff --git a/rgmanager/src/utils/Makefile b/rgmanager/src/utils/Makefile
index b2073c3..390fe76 100644
--- a/rgmanager/src/utils/Makefile
+++ b/rgmanager/src/utils/Makefile
@@ -66,8 +66,8 @@ depends:
 
 clean: generalclean
 
--include $(OBJS1:.o=.d)
--include $(OBJS2:.o=.d)
--include $(OBJS3:.o=.d)
--include $(OBJS4:.o=.d)
--include $(OBJS5:.o=.d)
+-include $(OBJS1:.o=.Tpo)
+-include $(OBJS2:.o=.Tpo)
+-include $(OBJS3:.o=.Tpo)
+-include $(OBJS4:.o=.Tpo)
+-include $(OBJS5:.o=.Tpo)


More information about the cluster-commits mailing list