[X2Go-Commits] [nx-libs] 07/45: imake cleanup: nx-X11/programs/Imakefile (reduce to minimal).

git-admin at x2go.org git-admin at x2go.org
Mon Apr 27 04:50:16 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 05d208351ccc42f50910504325006c90a308cde9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 4 13:43:54 2015 +0100

    imake cleanup: nx-X11/programs/Imakefile (reduce to minimal).
---
 nx-X11/programs/Imakefile |  136 ---------------------------------------------
 1 file changed, 136 deletions(-)

diff --git a/nx-X11/programs/Imakefile b/nx-X11/programs/Imakefile
index ffd1e6c..77a84a6 100644
--- a/nx-X11/programs/Imakefile
+++ b/nx-X11/programs/Imakefile
@@ -1,8 +1,3 @@
-XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:47:01 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/programs/Imakefile,v 3.54 2003/04/14 20:37:16 herrb Exp $
 /**************************************************************************/
 /*                                                                        */
 /* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
@@ -23,146 +18,15 @@ XCOMM $XFree86: xc/programs/Imakefile,v 3.54 2003/04/14 20:37:16 herrb Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 
-#if BuildServer || UseRgbTxt
-       RGBSRCDIR = rgb
-#endif
 #if BuildServer
         XSSRCDIR = Xserver
 #endif
-#if BuildXkbcomp
-      XKBCOMPDIR = xkbcomp
-#endif
-#ifndef Win32Architecture
-#if HasXServer
-     XINITSRCDIR = xinit
-#endif
-#if BuildXKBlib
-      XKBSRCDIRS = setxkbmap $(XKBCOMPDIR) xkbevd xkbprint xkbutils
-#endif
-#if BuildScreenSaverLibrary
-SCREENSAVESRCDIR = beforelight
-#endif
-#if BuildXF86VidModeLibrary
-  XVIDTUNESRCDIR = xvidtune
-#endif
-#if BuildXF86DGALibrary
-   XF86DGASRCDIR = xf86dga
-#endif
-#if BuildXAServer
-       XASSRCDIR = Xaserver
-#endif
-#if BuildLBX
-  LBXPROXYSRCDIR = lbxproxy
-#endif
-  PROXYMGRSRCDIR = proxymngr
-    RSTARTSRCDIR = rstart
-   SMPROXYSRCDIR = smproxy
-       TWMSRCDIR = twm
-  XCONSOLESRCDIR = xconsole
-       XDMSRCDIR = xdm
-XFINDPROXYSRCDIR = xfindproxy
-      XFWPSRCDIR = xfwp
-#if BuildXF86VidModeLibrary
-    XGAMMASRCDIR = xgamma
-#endif
-#if BuildXvLibrary
-    XVINFOSRCDIR = xvinfo
-#endif
-     XHOSTSRCDIR = xhost
-#if BuildPlugin && BuildXaw
-       XRXSRCDIR = xrx
-#endif
-       XSMSRCDIR = xsm
-#if BuildXterm
-     XTERMSRCDIR = xterm
-#endif
-      SCRIPTSDIR = scripts
-#endif /* Win32Architecture */
-#if BuildCID
-     MKCFMSRCDIR = mkcfm
-#endif
 
-#if (HasFreetype2 || BuildFreetype2Library) && BuildFontEncLib
-  MKFONTSCALEDIR = mkfontscale
-#endif
-
-#if BuildXInputLib
-XINPUTCLIENTDIRS = xsetmode xsetpointer
-#endif
-
-#if BuildXTrapLibrary
-XTRAPCLIENTDIRS = xtrap
-#endif
-
-/* makepsres should be considered as part of the DPS libraries */
-#if BuildDPSLibraries
-    MAKEPSRESDIR = makepsres
-#endif
-
-/* on the other hand, the following are independent clients */
-#if BuildDPSClients
-     DPSCLIENTDIRS = dpsinfo dpsexec texteroids
-#endif
-   XPMCLIENTDIRS = cxpm sxpm
-
-#if BuildGLXLibrary
-      GLXCLIENTDIRS = glxinfo glxgears
-#endif
-
-        XLOADDIR = xload
-
-#if BuildRandRLibrary
-       XRANDRDIR = xrandr
-#endif
-
-#if BuildXcursorgen
-   XCURSORGENDIR = xcursorgen
-#endif
-
-#if BuildFontconfigLibrary
-          FCDIRS = fc-cache fc-list
-#endif
-#if 0
-       FCLANGDIR = fc-lang
-#endif
-
-#if BuildXDriInfo
-        XDRIINFO = xdriinfo
-#endif
-
-#if BuildXaw
-        XMORE = xmore
-#endif
-
-#if BuildServersOnly || !BuildClients
 #if defined(NXEmbeddedXServer)
 SUBDIRS = $(XSSRCDIR) 
 #else
 SUBDIRS = $(XSSRCDIR) nxauth
 #endif
-#else
-SUBDIRS = \
-	appres bdftopcf bitmap \
-	$(SCREENSAVESRCDIR) editres $(FCDIRS) $(FCLANGDIR) fslsfonts fstobdf \
-	iceauth ico listres luit \
-	$(MAKEPSRESDIR) $(DPSCLIENTDIRS) $(DBECLIENTDIRS) \
-	$(MKCFMSRCDIR) \
-	mkfontdir $(MKFONTSCALEDIR) oclock $(PROXYMGRSRCDIR) \
-	$(RGBSRCDIR) $(RSTARTSRCDIR) showfont \
-	$(SMPROXYSRCDIR) $(TWMSRCDIR) viewres x11perf xauth xbiff xcalc \
-	xclipboard xclock \
-	xcmsdb $(XCONSOLESRCDIR) xditview $(XDMSRCDIR) xdpyinfo \
-	$(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel xfsinfo \
-	$(XFINDPROXYSRCDIR) $(XFWPSRCDIR) $(XGAMMASRCDIR) xgc $(XHOSTSRCDIR) \
-	$(XINITSRCDIR) $(XKBSRCDIRS) xkill $(XLOADDIR) xlogo xlsatoms \
-	xlsclients xlsfonts xmag xman xmessage xmh xmodmap $(XMORE) xprop \
-	xrdb xrefresh $(XRXSRCDIR) xset \
-	xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
-	$(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
-	$(XPMCLIENTDIRS) $(XVINFOSRCDIR) \
-	$(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(XPSRCDIRS) $(SCRIPTSDIR) \
-	$(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) $(XDRIINFO)
-#endif
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list