summaryrefslogtreecommitdiff
path: root/build/NWGNUhead.inc
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2011-03-04 01:19:29 +0000
committerGuenter Knauf <fuankg@apache.org>2011-03-04 01:19:29 +0000
commitc16c739cb3b93b193e0e0763480ddf0c4c3b2e88 (patch)
tree22959e8de91441a74f7acad20fb598d37d591030 /build/NWGNUhead.inc
parent7bcd12b29d916fe124c8dd084fd6337b56903f9b (diff)
downloadapr-c16c739cb3b93b193e0e0763480ddf0c4c3b2e88.tar.gz
NetWare build overhaul in order to compile on Linux.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1076916 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/NWGNUhead.inc')
-rw-r--r--build/NWGNUhead.inc21
1 files changed, 10 insertions, 11 deletions
diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc
index e9a5d097a..427e5ffe9 100644
--- a/build/NWGNUhead.inc
+++ b/build/NWGNUhead.inc
@@ -26,7 +26,7 @@ install :: NO_LICENSE_FILE
installdev :: NO_LICENSE_FILE
NO_LICENSE_FILE :
- $(MAKE) $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(METROWERKS)\license.dat"
+ $(MAKE) $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(METROWERKS)/license.dat"
else # LM_LICENSE_FILE must be defined so use the real targets
@@ -51,21 +51,20 @@ help :
@echo clean . . . . . . deletes $(OBJDIR) dirs, *.err, and *.map
@echo clobber_all . . . deletes all possible output from the make
@echo clobber_install . deletes all files in $(INSTALL)
- @$(CMD) echo.
+ @$(ECHONL)
@echo Multiple targets can be used on a single nmake command line -
@echo (i.e. $(MAKE) clean all)
- @$(CMD) echo.
+ @$(ECHONL)
@echo You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=release
@echo The default is RELEASE=release
clobber_all :: clean clobber_install
clobber_install ::
- -$(DELTREE) $(INSTALL) 2>NUL
+ -$(DELTREE) $(INSTALL)
test :: default
$(MAKE) -C $(APRTEST) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(LM_LICENSE_FILE)"
- $(CMD) echo.
#
# build recursive targets
@@ -73,13 +72,13 @@ test :: default
$(SUBDIRS) : FORCE
ifneq "$(MAKECMDGOALS)" "clean"
- $(CMD) echo.
+ @$(ECHONL)
@echo Building $(CURDIR)/$@
endif
$(MAKE) -C $@ $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(LM_LICENSE_FILE)"
- $(CMD) echo.
+ @$(ECHONL)
-FORCE:
+FORCE : ;
#
# Standard targets
@@ -87,13 +86,13 @@ FORCE:
clean :: $(SUBDIRS) $(APRTEST)
@echo Cleaning up $(CURDIR)
- -$(DELTREE) $(OBJDIR) 2> NUL
+ -$(DELTREE) $(OBJDIR)
$(CHK) *.err $(DEL) *.err
$(CHK) *.map $(DEL) *.map
$(CHK) *.d $(DEL) *.d
$(CHK) *.tmp $(DEL) *.tmp
- -$(DELTREE) $(OBJDIR) 2> NUL
+ -$(DELTREE) $(OBJDIR)
$(OBJDIR) ::
- $(CHKNOT) $(OBJDIR)\nul mkdir $(OBJDIR)
+ -$(MD) $@