apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1078617 - in /apr/apr/trunk: NWGNUmakefile build/NWGNUhead.inc build/NWGNUmakefile build/NWGNUtail.inc dbd/NWGNUdbdfreetds dbd/NWGNUdbdmysql dbd/NWGNUdbdpgsql dbd/NWGNUdbdsqli2 dbd/NWGNUdbdsqli3 dbm/NWGNUdbmdb dbm/NWGNUdbmgdbm
Date Sun, 06 Mar 2011 22:46:58 GMT
Author: fuankg
Date: Sun Mar  6 22:46:57 2011
New Revision: 1078617

URL: http://svn.apache.org/viewvc?rev=1078617&view=rev
Log:
NetWare build overhaul in order to compile on Linux.

Part 5.

Modified:
    apr/apr/trunk/NWGNUmakefile
    apr/apr/trunk/build/NWGNUhead.inc
    apr/apr/trunk/build/NWGNUmakefile
    apr/apr/trunk/build/NWGNUtail.inc
    apr/apr/trunk/dbd/NWGNUdbdfreetds
    apr/apr/trunk/dbd/NWGNUdbdmysql
    apr/apr/trunk/dbd/NWGNUdbdpgsql
    apr/apr/trunk/dbd/NWGNUdbdsqli2
    apr/apr/trunk/dbd/NWGNUdbdsqli3
    apr/apr/trunk/dbm/NWGNUdbmdb
    apr/apr/trunk/dbm/NWGNUdbmgdbm

Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Sun Mar  6 22:46:57 2011
@@ -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
 

Modified: apr/apr/trunk/build/NWGNUhead.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUhead.inc?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUhead.inc (original)
+++ apr/apr/trunk/build/NWGNUhead.inc Sun Mar  6 22:46:57 2011
@@ -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
 

Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Sun Mar  6 22:46:57 2011
@@ -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)

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Sun Mar  6 22:46:57 2011
@@ -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)" ""

Modified: apr/apr/trunk/dbd/NWGNUdbdfreetds
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdfreetds?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdfreetds (original)
+++ apr/apr/trunk/dbd/NWGNUdbdfreetds Sun Mar  6 22:46:57 2011
@@ -238,7 +238,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr/trunk/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdmysql?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdmysql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdmysql Sun Mar  6 22:46:57 2011
@@ -242,7 +242,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr/trunk/dbd/NWGNUdbdpgsql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdpgsql?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdpgsql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdpgsql Sun Mar  6 22:46:57 2011
@@ -239,7 +239,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli2
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli2?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli2 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli2 Sun Mar  6 22:46:57 2011
@@ -238,7 +238,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli3
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli3?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli3 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli3 Sun Mar  6 22:46:57 2011
@@ -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 \

Modified: apr/apr/trunk/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUdbmdb?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/dbm/NWGNUdbmdb (original)
+++ apr/apr/trunk/dbm/NWGNUdbmdb Sun Mar  6 22:46:57 2011
@@ -241,7 +241,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr/trunk/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUdbmgdbm?rev=1078617&r1=1078616&r2=1078617&view=diff
==============================================================================
--- apr/apr/trunk/dbm/NWGNUdbmgdbm (original)
+++ apr/apr/trunk/dbm/NWGNUdbmgdbm Sun Mar  6 22:46:57 2011
@@ -240,7 +240,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 



Mime
View raw message