diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-22 12:41:50 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-30 00:27:33 +0200 |
| commit | 2f3d394e87c61369ed1308c6b3bc53cf0295146c (patch) | |
| tree | 20f1060b8e86d858a8c4400098759bbf8097d5f6 /nx-X11/config/cf | |
| parent | 5b36f6443a1186d482ae1044b826c9fd67624c31 (diff) | |
| download | nx-libs-2f3d394e87c61369ed1308c6b3bc53cf0295146c.tar.gz nx-libs-2f3d394e87c61369ed1308c6b3bc53cf0295146c.tar.bz2 nx-libs-2f3d394e87c61369ed1308c6b3bc53cf0295146c.zip | |
nx-X11/config/{imake,makedepend}: Use system-wide available imake and makedepend tools.
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/Imake.rules | 16 | ||||
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 22 | ||||
| -rw-r--r-- | nx-X11/config/cf/Imakefile | 3 |
3 files changed, 3 insertions, 38 deletions
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index e023b6d26..f782f964b 100644 --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@ -1930,9 +1930,7 @@ DependDependencyStatement() @@\ NoCmpScript(ProgramTargetName($(DEPEND))) @@\ @@\ ProgramTargetName($(DEPEND)): @@\ - @echo "checking $@ over in $(DEPENDSRC) first..."; \ @@\ - cd $(DEPENDSRC) && $(MAKE) makedependonly; \ @@\ - echo "okay, continuing in $(CURRENT_DIR)" + echo "using system-wide depend, continuing in $(CURRENT_DIR)" #endif /* UseInstalled */ #endif /* DependDependency */ @@ -2025,11 +2023,7 @@ target:: ProgramTargetName($(IMAKE)) @@\ NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf) @@\ @@\ ProgramTargetName($(IMAKE)) $(IMAKE).Osuf: @@\ - -@(cd $(IMAKESRC) && if [ -f Makefile ]; then \ @@\ - echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) imakeonly; else \ @@\ - echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \ @@\ - $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \ @@\ - echo "okay, continuing in $(CURRENT_DIR)") + echo "using system-wide imake, continuing in $(CURRENT_DIR)" #endif /* UseInstalled */ #endif /* ImakeDependency */ @@ -3226,12 +3220,8 @@ target:: @@\ fi; \ @@\ done -#ifdef UseInstalled -#define ImakeSubCmdHelper $(IMAKE_CMD) -#else -#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ +#define ImakeSubCmdHelper $(IMAKE_CMD) -I$(IMAKEPREFIX)$(IRULESRC) \ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#endif #endif /* MakeMakeSubdirs */ diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 30a0dc73b..f40864ced 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -1386,35 +1386,13 @@ TCLIBDIR = TclLibDir #define LoaderLibPrefix /**/ #endif #ifndef ImakeCmd -#ifdef UseInstalled /* assume BINDIR in path */ #define ImakeCmd imake -#else -#define ImakeCmd $(IMAKESRC)/imake -#endif #endif #ifndef ImakeWarningFlags #define ImakeWarningFlags /* Nothing */ #endif #ifndef DependCmd -#if UseGccMakeDepend -#ifdef UseInstalled /* assume BINDIR in path */ -#define DependCmd gccmakedep -#else -#define DependCmd $(DEPENDSRC)/gccmakedep -#endif -#elif UseCCMakeDepend -#ifdef UseInstalled /* assume BINDIR in path */ -#define DependCmd ccmakedep -#else -#define DependCmd $(DEPENDSRC)/ccmakedep -#endif -#else -#ifdef UseInstalled /* assume BINDIR in path */ #define DependCmd makedepend -#else -#define DependCmd $(DEPENDSRC)/makedepend -#endif -#endif #endif #ifndef DependDefines # if UseCCMakeDepend || UseGccMakeDepend diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile index b7626590d..22eb09216 100644 --- a/nx-X11/config/cf/Imakefile +++ b/nx-X11/config/cf/Imakefile @@ -30,14 +30,12 @@ xorgversion.def \ nxversion.def RULEFILES = \ -Imake.rules \ X11.rules \ lnxLib.rules \ noop.rules \ xf86.rules TMPLFILES = \ -Imake.tmpl \ Library.tmpl \ Server.tmpl \ ServerLib.tmpl \ @@ -47,7 +45,6 @@ lnxLib.tmpl \ xorg.tmpl CFFILES = \ -Imake.cf \ linux.cf \ xorg.cf |