aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/Imake.rules16
-rw-r--r--nx-X11/config/cf/Imake.tmpl22
-rw-r--r--nx-X11/config/cf/Imakefile3
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