You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2011/04/01 04:15:34 UTC
svn commit: r1087555 - in /httpd/httpd/branches/2.2.x: NWGNUmakefile
build/NWGNUenvironment.inc modules/dav/fs/NWGNUmakefile
modules/dav/lock/NWGNUmakefile modules/dav/main/NWGNUmakefile
modules/ssl/NWGNUmakefile support/NWGNUmakefile
Author: fuankg
Date: Fri Apr 1 02:15:34 2011
New Revision: 1087555
URL: http://svn.apache.org/viewvc?rev=1087555&view=rev
Log:
NetWare build overhaul in order to compile on Linux.
the remaining bits ...
Modified:
httpd/httpd/branches/2.2.x/NWGNUmakefile
httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
httpd/httpd/branches/2.2.x/support/NWGNUmakefile
Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NWGNUmakefile?rev=1087555&r1=1087554&r2=1087555&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/NWGNUmakefile Fri Apr 1 02:15:34 2011
@@ -412,8 +412,6 @@ installdev :: FORCE
$(call COPY,$(NWOS)/*.h, $(INSTALLBASE)/include/)
$(call COPY,$(APR)/include/*.h, $(INSTALLBASE)/include/)
$(call COPY,$(APRUTIL)/include/*.h, $(INSTALLBASE)/include/)
- $(call COPY,$(STDMOD)/core/mod_so.h, $(INSTALLBASE)/include/)
- $(call COPY,$(STDMOD)/core/mod_watchdog.h, $(INSTALLBASE)/include/)
$(call COPY,$(STDMOD)/cache/mod_cache.h, $(INSTALLBASE)/include/)
$(call COPY,$(STDMOD)/database/mod_dbd.h, $(INSTALLBASE)/include/)
$(call COPY,$(STDMOD)/dav/main/mod_dav.h, $(INSTALLBASE)/include/)
@@ -423,8 +421,6 @@ installdev :: FORCE
$(call COPY,$(STDMOD)/loggers/mod_log_config.h, $(INSTALLBASE)/include/)
$(call COPY,$(STDMOD)/mappers/mod_rewrite.h, $(INSTALLBASE)/include/)
$(call COPY,$(STDMOD)/proxy/mod_proxy.h, $(INSTALLBASE)/include/)
- $(call COPY,$(STDMOD)/proxy/mod_serf.h, $(INSTALLBASE)/include/)
- $(call COPY,$(STDMOD)/session/mod_session.h, $(INSTALLBASE)/include/)
$(call COPY,$(STDMOD)/ssl/mod_ssl.h, $(INSTALLBASE)/include/)
$(call COPY,$(APR)/*.imp, $(INSTALLBASE)/lib/)
$(call COPY,$(NWOS)/*.imp, $(INSTALLBASE)/lib/)
Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?rev=1087555&r1=1087554&r2=1087555&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Fri Apr 1 02:15:34 2011
@@ -132,6 +132,7 @@ WIN_CC = mwcc
# Setup build tools
AWK = awk
+TOUCH = touch
# Setup distribution tools
ZIP = zip -qr9
Modified: httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile?rev=1087555&r1=1087554&r2=1087555&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile Fri Apr 1 02:15:34 2011
@@ -252,7 +252,8 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\moddavfs.nlm $(INSTALL)\$(BASEDIR)\modules
+ $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
+
#
# Any specialized rules here
#
Modified: httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile?rev=1087555&r1=1087554&r2=1087555&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile Fri Apr 1 02:15:34 2011
@@ -243,7 +243,8 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\moddavlk.nlm $(INSTALL)\$(BASEDIR)\modules
+ $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
+
#
# Any specialized rules here
#
Modified: httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile?rev=1087555&r1=1087554&r2=1087555&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile Fri Apr 1 02:15:34 2011
@@ -252,8 +252,8 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
-
+ $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
+
#
# Any specialized rules here
#
Modified: httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile?rev=1087555&r1=1087554&r2=1087555&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile Fri Apr 1 02:15:34 2011
@@ -269,10 +269,10 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
- -copy $(subst /,\,$(OSSLLIB))\openssl.nlm $(INSTALL)\$(BASEDIR)\bin\*.*
- -copy $(subst /,\,$(OSSLAPP))\openssl.cnf $(INSTALL)\$(BASEDIR)\bin\*.*
-
+ $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
+ $(call COPY,$(OSSLLIB)/openssl.nlm ,$(INSTALLBASE)/bin/)
+ $(call COPY,$(OSSLAPP)/openssl.cnf ,$(INSTALLBASE)/bin/)
+
#
# Any specialized rules here
#
@@ -282,11 +282,11 @@ vpath %.c $(AP_WORK)/modules/arch/netwar
# This requires a 'touch' utility. Can be downloaded from 'coreutils' at
# http://sourceforge.net/projects/gnuwin32/
ssl_expr_parse.h : ssl_expr_parse.y
- touch ssl_expr_parse.h
+ $(TOUCH) touch ssl_expr_parse.h
ssl_expr_parse.c : ssl_expr_parse.y
- touch ssl_expr_parse.c
+ $(TOUCH) ssl_expr_parse.c
ssl_expr_scan.c : ssl_expr_scan.l
- touch ssl_expr_scan.c
+ $(TOUCH) ssl_expr_scan.c
#
# Include the 'tail' makefile that has targets that depend on variables defined
Modified: httpd/httpd/branches/2.2.x/support/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/NWGNUmakefile?rev=1087555&r1=1087554&r2=1087555&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/support/NWGNUmakefile Fri Apr 1 02:15:34 2011
@@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\bin\*.*
+ $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/bin/)
#
# Any specialized rules here