diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
| commit | 1dad092caf01d733990648e6df64cbf964df5143 (patch) | |
| tree | 39de0e643e76754a3e23ca9dd0350b8ba4f76250 /nx-X11/config/Imakefile | |
| parent | 6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff) | |
| parent | 2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff) | |
| download | nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2 nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip | |
Merge branch '3.6.x'
Diffstat (limited to 'nx-X11/config/Imakefile')
| -rw-r--r-- | nx-X11/config/Imakefile | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile index f589e9636..1cf85aac8 100644 --- a/nx-X11/config/Imakefile +++ b/nx-X11/config/Imakefile @@ -1,34 +1,19 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ -XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" #undef BootstrapCleanSubdirs #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" -BOOTSTRAPSUBDIRS = imake makedepend -#if BuildDPSLibrary -PSWRAPDIR = pswrap -#endif -SUBDIRS = cf $(BOOTSTRAPSUBDIRS) util $(PSWRAPDIR) +NULL = + +SUBDIRS = cf -#if (defined(XFree86VersionString) || defined(XorgVersionString)) \ +#if defined(XorgVersionString) \ && defined(ProjectRoot) && \ defined(BuildBindist) -all:: version - -version: cf/version.def - RemoveFile(version) -#if defined (XFree86VersionString) - echo XFree86VersionString > version -#elif defined (XorgVersionString) - echo XorgVersionString > version -#endif - -InstallNamedNonExec(version,.$(VENDORNAMESHORT)_Version,ProjectRoot) +all:: clean:: - RemoveFile(version) #endif MakeSubdirs($(SUBDIRS)) |