aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nx-X11/Imakefile21
-rw-r--r--nx-X11/Makefile4
-rw-r--r--nx-X11/config/Imakefile11
-rw-r--r--nx-X11/config/cf/Imakefile4
-rw-r--r--nx-X11/config/cf/xorg.cf1
-rw-r--r--nx-X11/programs/Xserver/hw/xfree86/xf86Version.h59
-rw-r--r--nx-X11/programs/Xserver/include/Imakefile1
-rw-r--r--nx-X11/xf86Date.h1
8 files changed, 3 insertions, 99 deletions
diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile
index 78b4cb3f1..f2a8ca8ad 100644
--- a/nx-X11/Imakefile
+++ b/nx-X11/Imakefile
@@ -74,27 +74,6 @@ VerifyOS::
@echo ""
#endif
-#ifndef OS2Architecture
-version.def::
- $(RM) $(IRULESRC)/date.def
- @if [ -f ../../$(XF86SRC)/xf86Date.h ]; then \
- $(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def; \
- else \
- echo "" > $(IRULESRC)/date.def; \
- fi;
- $(RM) $(IRULESRC)/version.def
- @if [ -f ../../$(XF86SRC)/xf86Version.h ]; then \
- echo foo; \
- $(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def; \
- else \
- echo "" > $(IRULESRC)/version.def; \
- fi;
-#else /*OS2Architecture*/
-version.def::
- $(RM) $(IRULESRC)/date.def
- $(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
-#endif
-
includes::
MakeDir($(BUILDINCDIR))
MakeDir($(BUILDBINDIR))
diff --git a/nx-X11/Makefile b/nx-X11/Makefile
index 1096e62cf..bd3e284ae 100644
--- a/nx-X11/Makefile
+++ b/nx-X11/Makefile
@@ -55,7 +55,6 @@ BuildEnv:
fi
@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
${MAKE} $(MFLAGS) xmakefile
- ${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def
${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS
${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles
${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean
@@ -92,12 +91,11 @@ clean:
find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
- rm -f config/cf/{version.def,date.def}
dangerous_strip_clean:
${MAKE} ${MAKE_OPTS} $@
distclean:
-${MAKE} ${MAKE_OPTS} $@
- $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
+ $(RM) xmakefile
depend:
${MAKE} ${MAKE_OPTS} $@
Everything:
diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile
index 7d1217a46..305b87107 100644
--- a/nx-X11/config/Imakefile
+++ b/nx-X11/config/Imakefile
@@ -13,18 +13,9 @@ SUBDIRS = cf
#if defined(XorgVersionString) \
&& defined(ProjectRoot) && \
defined(BuildBindist)
-all:: version
-
-version: cf/version.def
- RemoveFile(version)
-#if defined (XorgVersionString)
- echo XorgVersionString > version
-#endif
-
-InstallNamedNonExec(version,.$(VENDORNAMESHORT)_Version,ProjectRoot)
+all::
clean::
- RemoveFile(version)
#endif
MakeSubdirs($(SUBDIRS))
diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile
index 22eb09216..a36adf323 100644
--- a/nx-X11/config/cf/Imakefile
+++ b/nx-X11/config/cf/Imakefile
@@ -16,9 +16,7 @@ host.def
#endif
#if defined(XorgVersion)
-VERSIONDEFFILES = \
-date.def \
-version.def
+VERSIONDEFFILES =
#endif
DEFFILES = \
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 9fb92c61f..5ed60e491 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -10,7 +10,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
/* Get and set version information. */
-#include "date.def"
#include "xorgversion.def"
#if !defined(XorgVersionString) && \
diff --git a/nx-X11/programs/Xserver/hw/xfree86/xf86Version.h b/nx-X11/programs/Xserver/hw/xfree86/xf86Version.h
deleted file mode 100644
index f7ac89b1b..000000000
--- a/nx-X11/programs/Xserver/hw/xfree86/xf86Version.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/*
- * Copyright (c) 1994-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifndef XF86_VERSION_CURRENT
-
-#define XF86_VERSION_MAJOR 4
-#define XF86_VERSION_MINOR 3
-#define XF86_VERSION_PATCH 99
-#define XF86_VERSION_SNAP 902
-
-/* This has five arguments for compatibilty reasons */
-#define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \
- (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
-
-#define XF86_GET_MAJOR_VERSION(vers) ((vers) / 10000000)
-#define XF86_GET_MINOR_VERSION(vers) (((vers) % 10000000) / 100000)
-#define XF86_GET_PATCH_VERSION(vers) (((vers) % 100000) / 1000)
-#define XF86_GET_SNAP_VERSION(vers) ((vers) % 1000)
-
-/* Define these for compatibility. They'll be removed at some point. */
-#define XF86_VERSION_SUBMINOR XF86_VERSION_PATCH
-#define XF86_VERSION_BETA 0
-#define XF86_VERSION_ALPHA XF86_VERSION_SNAP
-
-#define XF86_VERSION_CURRENT \
- XF86_VERSION_NUMERIC(XF86_VERSION_MAJOR, \
- XF86_VERSION_MINOR, \
- XF86_VERSION_PATCH, \
- XF86_VERSION_SNAP, \
- 0)
-
-#endif
-
-/* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile
index 4c9b169a4..ffe849579 100644
--- a/nx-X11/programs/Xserver/include/Imakefile
+++ b/nx-X11/programs/Xserver/include/Imakefile
@@ -15,7 +15,6 @@ LinkSourceFile(xf86Opt.h,$(XF86COMSRC))
#endif
LinkSourceFile(xf86_libc.h,$(XF86OSSRC))
LinkSourceFile(xf86_ansic.h,$(XF86OSSRC))
-LinkSourceFile(xf86Version.h,$(XF86SRC))
LinkSourceFile(compiler.h,$(XF86COMSRC))
#endif
diff --git a/nx-X11/xf86Date.h b/nx-X11/xf86Date.h
deleted file mode 100644
index 02444e142..000000000
--- a/nx-X11/xf86Date.h
+++ /dev/null
@@ -1 +0,0 @@
-XCOMM empty file
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 05:19:30 +0000