[Ocfs2-commits] manish commits r1144 - trunk

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-17 21:56:38 -0500 (Thu, 17 Jun 2004)
New Revision: 1144

Added:
   trunk/Versioning.make
Modified:
   trunk/Makefile
   trunk/Postamble.make
Log:
Enable vermagic for 2.6


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2004-06-18 02:55:28 UTC (rev 1143)
+++ trunk/Makefile	2004-06-18 02:56:38 UTC (rev 1144)
@@ -9,6 +9,7 @@
 	Config.make.in	\
 	Preamble.make	\
 	Postamble.make	\
+	Versioning.make	\
 	config.guess	\
 	config.sub	\
 	configure	\

Modified: trunk/Postamble.make
===================================================================
--- trunk/Postamble.make	2004-06-18 02:55:28 UTC (rev 1143)
+++ trunk/Postamble.make	2004-06-18 02:56:38 UTC (rev 1144)
@@ -1,38 +1,9 @@
-ifdef VERSION_SRC
+include $(TOPDIR)/Versioning.make
 
-ifndef VERSION_FILES
-$(error Need VERSION_FILES defined for version objects)
-endif
-
-ifndef VERSION_PREFIX
-$(error Need VERSION_PREFIX defined for version objects)
-endif
-
-VERSION_OBJ = $(subst .c,.o,$(VERSION_SRC))
-
-VERSION_NUM = $(VERSION_PREFIX)_BUILD_VERSION
-VERSION_DATE = $(VERSION_PREFIX)_BUILD_DATE
-VERSION_MD5 = $(VERSION_PREFIX)_BUILD_MD5
-
-VERDEFS = -D$(VERSION_NUM)=\""$(VERSION)"\" \
-	  -D$(VERSION_DATE)=\""$(shell LANG=C date)"\" \
-	  -D$(VERSION_MD5)=\""$(shell cat stamp-md5)"\"
-
-VERMAGIC = $(if $(filter $(VERSION_OBJ),$@),$(VERDEFS))
-
-ifneq ($(MAKECMDGOALS),install)
-VERSTAMP = stamp
-endif
-
-stamp: ;
-
-stamp-md5: $(VERSION_FILES)
-	@cat $(VERSION_FILES) Makefile | md5sum | sed -e 's/ .*//' > stamp-md5
-
+ifdef VERSION_OBJ
 $(VERSION_OBJ): stamp-md5 $(VERSTAMP)
 endif
 
-
 LOCAL_CFLAGS = $($(subst /,_,$(basename $@))_CFLAGS)
 LOCAL_CPPFLAGS = $($(subst /,_,$(basename $@))_CPPFLAGS)
 

Added: trunk/Versioning.make
===================================================================
--- trunk/Versioning.make	2004-06-18 02:55:28 UTC (rev 1143)
+++ trunk/Versioning.make	2004-06-18 02:56:38 UTC (rev 1144)
@@ -0,0 +1,38 @@
+ifdef VERSION_SRC
+
+ifndef VERSION_FILES
+$(error Need VERSION_FILES defined for version objects)
+endif
+
+ifndef VERSION_PREFIX
+$(error Need VERSION_PREFIX defined for version objects)
+endif
+
+VERSION_OBJ = $(subst .c,.o,$(VERSION_SRC))
+
+VERSION_NUM = $(VERSION_PREFIX)_BUILD_VERSION
+VERSION_DATE = $(VERSION_PREFIX)_BUILD_DATE
+VERSION_MD5 = $(VERSION_PREFIX)_BUILD_MD5
+
+ifdef STAMP_DIR
+STAMP_MD5 = $(STAMP_DIR)/stamp-md5
+else
+STAMP_MD5 = stamp-md5
+endif
+
+VERDEFS = -D$(VERSION_NUM)=\""$(VERSION)"\" \
+	  -D$(VERSION_DATE)=\""$(shell LANG=C date)"\" \
+	  -D$(VERSION_MD5)=\""$(shell cat $(STAMP_MD5))"\"
+
+VERMAGIC = $(if $(filter $(VERSION_OBJ),$@),$(VERDEFS))
+
+ifneq ($(MAKECMDGOALS),install)
+VERSTAMP = stamp
+endif
+
+stamp: ;
+
+$(STAMP_MD5): $(VERSION_FILES)
+	@cat $(VERSION_FILES) Makefile | md5sum | sed -e 's/ .*//' > stamp-md5
+
+endif