diff options
author | Mihai Moldovan <ionic@ionic.de> | 2015-04-28 05:15:19 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-28 05:15:19 +0200 |
commit | 7b7ba9441b3ff72f0e963221342dcccbafc04312 (patch) | |
tree | f718af7b85c4a17a28eb12f81922b1e3d1eb6481 /nx-X11/include/Imakefile | |
parent | cbf4e4dbebaca561ff2ff98521e249b9eac046ab (diff) | |
parent | 662a89545f3e953a47f176cf64e574350643d446 (diff) | |
download | nx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.tar.gz nx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.tar.bz2 nx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.zip |
Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x
Attributes GH PR #17: https://github.com/ArcticaProject/nx-libs/pull/17
Diffstat (limited to 'nx-X11/include/Imakefile')
-rw-r--r-- | nx-X11/include/Imakefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile index 74d775b75..e46abbdfd 100644 --- a/nx-X11/include/Imakefile +++ b/nx-X11/include/Imakefile @@ -4,6 +4,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $ XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $ + +NULL = + #define IHaveSubdirs #define PassCDebugFlags /**/ @@ -11,11 +14,7 @@ XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $ GLXDIR = GL #endif -#if BuildDPSLibrary -DPSDIR = DPS -#endif - -SUBDIRS = extensions $(GLXDIR) $(DPSDIR) +SUBDIRS = extensions $(GLXDIR) #ifdef Win32Architecture EXTRA_HEADERS = Xw32defs.h Xwinsock.h Xwindows.h @@ -23,7 +22,8 @@ EXTRA_HEADERS = Xw32defs.h Xwinsock.h Xwindows.h EXTRA_HEADERS = Xwindows.h #endif -HEADERS = DECkeysym.h \ +HEADERS = \ + DECkeysym.h \ HPkeysym.h \ Sunkeysym.h \ X.h \ @@ -46,7 +46,8 @@ HEADERS = DECkeysym.h \ ap_keysym.h \ keysym.h \ keysymdef.h \ - $(EXTRA_HEADERS) + $(EXTRA_HEADERS) \ + $(NULL) all:: |