diff options
| -rw-r--r-- | NWGNUmakefile | 4 | ||||
| -rw-r--r-- | build/NWGNUhead.inc | 32 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 4 | ||||
| -rw-r--r-- | build/NWGNUtail.inc | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdfreetds | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdmysql | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdpgsql | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdsqli2 | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdsqli3 | 2 | ||||
| -rw-r--r-- | dbm/NWGNUdbmdb | 2 | ||||
| -rw-r--r-- | dbm/NWGNUdbmgdbm | 2 |
11 files changed, 28 insertions, 28 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index e5c1bc754..6765c1af7 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -425,9 +425,9 @@ nlms :: libs $(TARGET_nlm) install :: nlms $(INSTDIRS) FORCE $(call COPY,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/) ifndef DEST - -$(call COPY,$(APR)/STATUS,$(INSTALLBASE)/*.apr) + -$(call COPY,$(APR)/STATUS,$(INSTALLBASE)/STATUS.apr) -$(call COPY,$(APR)/LICENSE,$(INSTALLBASE)/) - -$(call COPY,$(APR)/CHANGES,$(INSTALLBASE)/*.apr) + -$(call COPY,$(APR)/CHANGES,$(INSTALLBASE)/CHANGES.apr) @-$(call COPYR,$(APR)/docs,$(INSTALLBASE)/docs/) endif diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc index 28b148993..6b63c9c20 100644 --- a/build/NWGNUhead.inc +++ b/build/NWGNUhead.inc @@ -39,24 +39,24 @@ $(TARGETS) :: $(SUBDIRS) endif #NO_LICENSE_FILE check help : - @echo targets for RELEASE=$(RELEASE): - @echo (default) . . . . libs nlms - @echo all . . . . . . . does everything (libs nlms install) - @echo libs. . . . . . . builds all libs - @echo nlms. . . . . . . builds all nlms - @echo install . . . . . builds libs and nlms and copies install files to - @echo "$(INSTALL)" - @echo installdev. . . . copies headers and files needed for development to - @echo "$(INSTALL)" - @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) + @echo $(DS)targets for RELEASE=$(RELEASE):$(DS) + @echo $(DS)(default) . . . . libs nlms$(DS) + @echo $(DS)all . . . . . . . does everything (libs nlms install)$(DS) + @echo $(DS)libs. . . . . . . builds all libs$(DS) + @echo $(DS)nlms. . . . . . . builds all nlms$(DS) + @echo $(DS)install . . . . . builds libs and nlms and copies install files to$(DS) + @echo $(DS) "$(INSTALL)"$(DS) + @echo $(DS)installdev. . . . copies headers and files needed for development to$(DS) + @echo $(DS) "$(INSTALL)"$(DS) + @echo $(DS)clean . . . . . . deletes $(OBJDIR) dirs, *.err, and *.map$(DS) + @echo $(DS)clobber_all . . . deletes all possible output from the make$(DS) + @echo $(DS)clobber_install . deletes all files in $(INSTALL)$(DS) @$(ECHONL) - @echo Multiple targets can be used on a single nmake command line - - @echo (i.e. $(MAKE) clean all) + @echo $(DS)Multiple targets can be used on a single make command line -$(DS) + @echo $(DS)(i.e. $(MAKE) clean all)$(DS) @$(ECHONL) - @echo You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=release - @echo The default is RELEASE=release + @echo $(DS)You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=release$(DS) + @echo $(DS)The default is RELEASE=release$(DS) clobber_all :: clean clobber_install diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index ab9fdbc3a..7fabc9cc9 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -26,12 +26,12 @@ nlms :: $(APR)/aprlib.imp $(APR)/aprlib.imp : make_nw_export.awk nw_export.i # @echo Generating $@ - @echo GEN $@ + @echo $(DL)GEN $@$(DL) $(AWK) -v EXPPREFIX=APR$(VERSION_MAJMIN) -f $^ | $(SORT) >$@ nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt # @echo Generating $@ - @echo GEN $@ + @echo $(DL)GEN $@$(DL) $(CC) $< @$(NLM_NAME)_cc.opt $(NLM_NAME)_cc.opt : NWGNUmakefile $(APR)/build/NWGNUenvironment.inc $(APR)/build/NWGNUhead.inc $(APR)/build/NWGNUtail.inc $(CUSTOM_INI) diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 44856162a..51b3e30a0 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -275,10 +275,10 @@ else @echo -sym internal >> $@ endif @echo -l $(APR)/$(OBJDIR) >> $@ - @echo -l $(APRBUCKETS)/$(OBJDIR) >> $@ @echo -l $(APRLDAP)/$(OBJDIR) >> $@ @echo -l $(APRXML)/$(OBJDIR) >> $@ @echo -l $(APR)/misc/netware >> $@ + @echo -l $(APR) >> $@ @echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime"$(DL) >> $@ @echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++"$(DL) >> $@ ifneq "$(IPV6)" "" diff --git a/dbd/NWGNUdbdfreetds b/dbd/NWGNUdbdfreetds index a79a2ffd5..bc631ee83 100644 --- a/dbd/NWGNUdbdfreetds +++ b/dbd/NWGNUdbdfreetds @@ -238,7 +238,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) diff --git a/dbd/NWGNUdbdmysql b/dbd/NWGNUdbdmysql index 10c4dbf15..6f63946d7 100644 --- a/dbd/NWGNUdbdmysql +++ b/dbd/NWGNUdbdmysql @@ -242,7 +242,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) diff --git a/dbd/NWGNUdbdpgsql b/dbd/NWGNUdbdpgsql index 9e04f5427..4862237c0 100644 --- a/dbd/NWGNUdbdpgsql +++ b/dbd/NWGNUdbdpgsql @@ -239,7 +239,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) diff --git a/dbd/NWGNUdbdsqli2 b/dbd/NWGNUdbdsqli2 index bd5778853..584f60ab5 100644 --- a/dbd/NWGNUdbdsqli2 +++ b/dbd/NWGNUdbdsqli2 @@ -238,7 +238,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) diff --git a/dbd/NWGNUdbdsqli3 b/dbd/NWGNUdbdsqli3 index 921a373b5..d5468bce3 100644 --- a/dbd/NWGNUdbdsqli3 +++ b/dbd/NWGNUdbdsqli3 @@ -238,7 +238,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ apr_dbd_mutex_lock \ apr_dbd_mutex_unlock \ diff --git a/dbm/NWGNUdbmdb b/dbm/NWGNUdbmdb index 03b099cd6..978340535 100644 --- a/dbm/NWGNUdbmdb +++ b/dbm/NWGNUdbmdb @@ -241,7 +241,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) diff --git a/dbm/NWGNUdbmgdbm b/dbm/NWGNUdbmgdbm index 10709a54b..aeacc7730 100644 --- a/dbm/NWGNUdbmgdbm +++ b/dbm/NWGNUdbmgdbm @@ -240,7 +240,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) |