Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
6c7f9cda
Commit
6c7f9cda
authored
Oct 28, 2016
by
Ulrich Sibiller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove xf86Version.h and xf86Date.h
version.def and date.def also will be no longer created
parent
4cdcd914
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
3 additions
and
99 deletions
+3
-99
Imakefile
nx-X11/Imakefile
+0
-21
Makefile
nx-X11/Makefile
+1
-3
Imakefile
nx-X11/config/Imakefile
+1
-10
Imakefile
nx-X11/config/cf/Imakefile
+1
-3
xorg.cf
nx-X11/config/cf/xorg.cf
+0
-1
xf86Version.h
nx-X11/programs/Xserver/hw/xfree86/xf86Version.h
+0
-59
Imakefile
nx-X11/programs/Xserver/include/Imakefile
+0
-1
xf86Date.h
nx-X11/xf86Date.h
+0
-1
No files found.
nx-X11/Imakefile
View file @
6c7f9cda
...
...
@@ -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))
...
...
nx-X11/Makefile
View file @
6c7f9cda
...
...
@@ -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
:
...
...
nx-X11/config/Imakefile
View file @
6c7f9cda
...
...
@@ -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))
...
...
nx-X11/config/cf/Imakefile
View file @
6c7f9cda
...
...
@@ -16,9 +16,7 @@ host.def
#endif
#if defined(XorgVersion)
VERSIONDEFFILES = \
date.def \
version.def
VERSIONDEFFILES =
#endif
DEFFILES = \
...
...
nx-X11/config/cf/xorg.cf
View file @
6c7f9cda
...
...
@@ -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) && \
...
...
nx-X11/programs/Xserver/hw/xfree86/xf86Version.h
deleted
100644 → 0
View file @
4cdcd914
/*
* 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 $ */
nx-X11/programs/Xserver/include/Imakefile
View file @
6c7f9cda
...
...
@@ -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
...
...
nx-X11/xf86Date.h
deleted
100644 → 0
View file @
4cdcd914
XCOMM
empty
file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment