diff options
Diffstat (limited to 'nx-X11/include')
| -rw-r--r-- | nx-X11/include/Imakefile | 15 | ||||
| -rw-r--r-- | nx-X11/include/extensions/Imakefile | 45 |
2 files changed, 38 insertions, 22 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:: diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 24c034103..3f2992b77 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -6,7 +6,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $ XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.55 2003/04/21 12:32:06 sven Exp $ -#if BuildScreenSaverExt || BuildScreenSaverLibrary +NULL = + +#if BuildScreenSaverExt SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h #endif @@ -22,11 +24,11 @@ XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h #if BuildXF86DGA || BuildXF86DGALibrary XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h #endif -#if BuildLBX || BuildXextLib +#if BuildXextLib LBXHEADERS = XLbx.h lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h \ lbxstr.h lbxzlib.h #endif -#if BuildXvExt || BuildXvLibrary +#if BuildXvExt XVHEADERS = Xv.h Xvlib.h Xvproto.h XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h #endif @@ -54,26 +56,38 @@ COMPOSITEHEADERS = composite.h compositeproto.h #if BuildRandR || BuildRandRLibrary RANDRHEADERS = randr.h randrproto.h #endif -#if BuildXTrap || BuildXTrapLibrary +#if BuildXTrap XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \ xtraplibp.h xtrapproto.h #endif #if BuildXResExt || BuildXResLibrary XRESHEADERS = XRes.h XResproto.h #endif -#if BuildXevie || BuildXevieLibrary +#if BuildXevie XEVIEHEADERS = Xevie.h Xeviestr.h #endif -EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \ - $(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \ - $(LBXHEADERS) $(XVHEADERS) $(XVMCHEADERS) $(XF86RUSHHEADERS) \ - $(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \ - $(XFIXESHEADERS) $(DAMAGEHEADERS) $(COMPOSITEHEADERS) \ - $(XEVIEHEADERS) \ - $(XTRAPHEADERS) $(XRESHEADERS) - - +EXTRAHEADERS = \ + $(SCREENSAVERHEADERS) \ + $(XF86MISCHEADERS) \ + $(XF86BIGFONTHEADERS) \ + $(XF86VIDMODEHEADERS) \ + $(XF86DGAHEADERS) \ + $(XINERAMAHEADERS) \ + $(LBXHEADERS) \ + $(XVHEADERS) \ + $(XVMCHEADERS) \ + $(XF86RUSHHEADERS) \ + $(FONTCACHEHEADERS) \ + $(RENDERHEADERS) \ + $(RANDRHEADERS) \ + $(XFIXESHEADERS) \ + $(DAMAGEHEADERS) \ + $(COMPOSITEHEADERS) \ + $(XEVIEHEADERS) \ + $(XTRAPHEADERS) \ + $(XRESHEADERS) \ + $(NULL) HEADERS = Xext.h \ xcmiscstr.h \ @@ -94,7 +108,8 @@ HEADERS = Xext.h \ sync.h syncstr.h \ Xcup.h Xcupstr.h \ dpms.h dpmsstr.h \ - XEVI.h XEVIstr.h + XEVI.h XEVIstr.h \ + $(NULL) all:: |