diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-30 15:41:03 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-30 15:41:03 +0200 |
| commit | ba10ceffc5f17e9c966692c85d7e7866e16f84bf (patch) | |
| tree | 07260fb82184fc526e7cd8815fd51165edd948b4 /nx-X11/config/cf/Imake.rules | |
| parent | 5b36f6443a1186d482ae1044b826c9fd67624c31 (diff) | |
| parent | 298744e94948c3541bb8f9d9dbb1af6708aecea5 (diff) | |
| download | nx-libs-ba10ceffc5f17e9c966692c85d7e7866e16f84bf.tar.gz nx-libs-ba10ceffc5f17e9c966692c85d7e7866e16f84bf.tar.bz2 nx-libs-ba10ceffc5f17e9c966692c85d7e7866e16f84bf.zip | |
Merge branch 'sunweaver-pr/drop-embedded-imake-and-makedepend' into 3.6.x
Attributes GH PR #146: https://github.com/ArcticaProject/nx-libs/pull/146
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Thu, 30 Jun 2016 06:30:46 -0700
Diffstat (limited to 'nx-X11/config/cf/Imake.rules')
| -rw-r--r-- | nx-X11/config/cf/Imake.rules | 16 |
1 files changed, 3 insertions, 13 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 */ |