diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
| commit | ae0a2bfdeb9ceacb80aa03375353039d425b14b9 (patch) | |
| tree | daec55145477bcec69273e03d5c9ff10c10a4137 /nx-X11/Makefile | |
| parent | cbe2c0e44f412d07024207f374c0f56684adb088 (diff) | |
| parent | 3b7e5a42f5abecb903a9d730d163d704520efb07 (diff) | |
| download | nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.gz nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.bz2 nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.zip | |
Merge branch 'sunweaver-pr/libnx-x11-autoreconf' into 3.6.x
Attributes GH PR #498: https://github.com/ArcticaProject/nx-libs/pull/498
Diffstat (limited to 'nx-X11/Makefile')
| -rw-r--r-- | nx-X11/Makefile | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/nx-X11/Makefile b/nx-X11/Makefile index bd3e284ae..5845a4c77 100644 --- a/nx-X11/Makefile +++ b/nx-X11/Makefile @@ -24,8 +24,8 @@ MAKE_OPTS = -f xmakefile MAKE_CMD = $(MAKE) $(MAKE_OPTS) all: - @${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial - @${MAKE} ${MAKE_OPTS} $@ + @${MAKE_CMD} xmakefile-exists || $(MAKE) all-initial + @${MAKE_CMD} $@ all-initial: @echo Please use make World, or on NT use nmake World.Win32. @@ -40,27 +40,32 @@ World: @date @echo "" if [ ! -f xmakefile ]; then ${MAKE} ${MFLAGS} BuildEnv; fi - ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World + ${MAKE_CMD} $(MFLAGS) $(WORLDOPTS) World @echo "" @date @echo "" @echo Full build of $(RELEASE) complete. @echo "" -BuildEnv: +CleanEnv: @if [ -f xmakefile ]; then \ - ${MAKE} ${MAKE_OPTS} -k distclean || \ - ${MAKE} ${MAKE_OPTS} -k clean || \ + ${MAKE_CMD} -k distclean || \ + ${MAKE_CMD} -k clean || \ $(RM) xmakefile; \ fi @rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def; ${MAKE} $(MFLAGS) xmakefile - ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS - ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles - ${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean - ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes - ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend + ${MAKE_CMD} $(MFLAGS) VerifyOS + ${MAKE_CMD} $(MFLAGS) Makefiles + ${MAKE_CMD} $(MFLAGS) BOOTSTRAPSUBDIRS= clean +BuildEnv: CleanEnv BuildIncludes BuildDependsOnly + +BuildIncludes: CleanEnv + ${MAKE_CMD} $(MFLAGS) includes + +BuildDependsOnly: + ${MAKE_CMD} $(MFLAGS) depend .PRECIOUS: Makefile @@ -86,37 +91,35 @@ xmakefile: Imakefile # a copy of every rule that might be invoked at top level clean: - -${MAKE_CMD} ${MAKE_OPTS} $@ - find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + -${MAKE_CMD} $@ + find config lib programs include -type f -name Makefile | while read makefile; do rm -f $$makefile; done + dangerous_strip_clean: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ distclean: - -${MAKE} ${MAKE_OPTS} $@ + -${MAKE_CMD} $@ $(RM) xmakefile depend: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ Everything: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ external.ln: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ includes: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ install.sdk: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ install.ln: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ install.man: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ install: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ Makefiles: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ man_keywords: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ tags: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ VerifyOS: - ${MAKE} ${MAKE_OPTS} $@ + ${MAKE_CMD} $@ |