[xorg-commit-diffs] xc Imakefile,1.1.1.6,1.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc
In directory pdx:/home/eich/mytree/xc

Modified Files:
	Imakefile 
Log Message:
- merging XORG-CURRENT-CLOSED to trunk (testfile)



Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/Imakefile,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -u -d -r1.1.1.6 -r1.2
--- a/Imakefile	14 Mar 2004 08:26:39 -0000	1.1.1.6
+++ b/Imakefile	23 Apr 2004 18:37:39 -0000	1.2
@@ -3,17 +3,13 @@
 
 
 
-XCOMM $XFree86: xc/Imakefile,v 3.30 2003/08/24 20:31:43 tsi Exp $
+XCOMM $XFree86: xc/Imakefile,v 3.29tsi Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 
 RELEASE = XOrgReleaseString
 
-#ifdef XFree86VersionString
-VERSTRING = " "version XFree86VersionString "("XFree86DateString")"
-#endif
-
 #ifndef OSName
 #define OSName Unknown Operating System!
 #endif
@@ -51,11 +47,6 @@
 #define IHaveSpecialMakefileTarget
 
 #ifndef Win32Architecture
-#ifdef XFree86VersionString
-VerifyOS::
-	@echo ""
-	@echo Building XFree86 version XFree86VersionString "("XFree86DateString")."
-#endif
 VerifyOS::
 	@echo ""
 	@echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")."
@@ -73,23 +64,15 @@
 	@echo ""
 #endif
 
-#ifdef XFree86Version
 #ifndef OS2Architecture
 version.def::
-	$(RM) $(IRULESRC)/version.def
 	$(RM) $(IRULESRC)/date.def
-	$(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
 	$(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
 #else /*OS2Architecture*/
 version.def::
-	$(RM) $(IRULESRC)/version.def
 	$(RM) $(IRULESRC)/date.def
-	$(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
 	$(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
 #endif
-#else
-version.def::
-#endif
 
 includes::
 	MakeDir($(BUILDINCDIR))
@@ -110,7 +93,7 @@
 
 Everything::
 	@echo ""
-	@echo Rebuilding XFree86$(VERSTRING).
+	@echo Rebuilding $(RELEASE) of the X Window System.
 	@echo ""
 	@date
 	@echo ""
@@ -128,7 +111,7 @@
 	@echo ""
 	@date
 	@echo ""
-	@echo Rebuild of XFree86$(VERSTRING) complete.
+	@echo Rebuild of $(RELEASE) of the X Window System complete.
 	@echo ""
 
 XCOMM clean out link tree looking for stuff that should get checked in
@@ -155,7 +138,7 @@
 
 Everything::
 	@echo :
-	@echo Rebuilding XFree86$(VERSTRING).
+	@echo Rebuilding $(RELEASE) of the X Window System.
 	@echo :
 	@echo :
 	cd $(IMAKESRC)
@@ -169,7 +152,7 @@
 	$(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS)
 	@echo :
 	@echo :
-	@echo Rebuild of XFree86$(VERSTRING) complete.
+	@echo Rebuild of $(RELEASE) of the X Window System complete.
 	@echo :
 
 #ifdef ProjectRoot