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/Imakefile | |
| 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/Imakefile')
| -rw-r--r-- | nx-X11/Imakefile | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile index 46ca9e70c..45948d2af 100644 --- a/nx-X11/Imakefile +++ b/nx-X11/Imakefile @@ -105,11 +105,6 @@ Everything:: @echo "" @date @echo "" - cd $(IMAKESRC) && if [ -f Makefile ]; then \ - $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ - else \ - $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ - fi -$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak $(MAKE) $(MFLAGS) xmakefile $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles @@ -149,9 +144,6 @@ Everything:: @echo Rebuilding $(RELEASE) of the X Window System. @echo : @echo : - cd $(IMAKESRC) - $(MAKE) $(MFLAGS) -f Makefile.ini imake.exe - cd ..\.. RMoveToBakFile(xmakefile) $(MAKE) $(MFLAGS) xmakefile $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles @@ -186,7 +178,3 @@ xmakefile-exists:: #ifndef MakeHtmlManIndex #define MakeHtmlManIndex YES /* install.man generates HTML man page index */ #endif - -#undef BootstrapCleanSubdirs -#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" -BOOTSTRAPSUBDIRS = imake makedepend |