More NetWare build fixes.

Sorted some makefile dependencies; fixed DAV makefiles.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1083478 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index efdd8f03f9c11d84dad06808372dacffde915878..ebd2f958a90c61e33c9f61ce9fb7ec883eab9c5d 100644 (file)
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -47,28 +47,18 @@ endif
 # Create dependency lists based on the files available
 #
 
-CCOPT_DEPENDS  = \
+STANDARD_DEPENDS       = \
                                $(APBUILD)/NWGNUhead.inc \
                                $(APBUILD)/NWGNUenvironment.inc \
                                $(APBUILD)/NWGNUtail.inc \
-                               NWGNUmakefile \
                                $(CUSTOM_INI) \
                                $(EOLIST)
 
-CPPOPT_DEPENDS = \
-                               $(APBUILD)/NWGNUhead.inc \
-                               $(APBUILD)/NWGNUenvironment.inc \
-                               $(APBUILD)/NWGNUtail.inc \
-                               NWGNUmakefile \
-                               $(CUSTOM_INI) \
-                               $(EOLIST)
+CCOPT_DEPENDS  = $(STANDARD_DEPENDS)
 
 $(NLM_NAME)_LINKOPT_DEPENDS    = \
                                $(TARGET_lib) \
-                               $(APBUILD)/NWGNUenvironment.inc \
-                               NWGNUmakefile \
-                               $(APBUILD)/NWGNUtail.inc \
-                               $(CUSTOM_INI) \
+                               $(STANDARD_DEPENDS) \
                                $(VERSION_INC) \
                                $(EOLIST)
 
@@ -76,23 +66,27 @@ ifeq "$(words $(strip $(TARGET_lib)))" "1"
 LIB_NAME                       = $(basename $(notdir $(TARGET_lib)))
 $(LIB_NAME)_LIBLST_DEPENDS     = \
                                $(FILES_lib_objs) \
-                               $(APBUILD)/NWGNUenvironment.inc \
-                               NWGNUmakefile \
-                               $(APBUILD)/NWGNUtail.inc \
+                               $(STANDARD_DEPENDS) \
                                $(CUSTOM_INI) \
                                $(EOLIST)
 endif
 
 ifeq "$(wildcard NWGNU$(LIB_NAME))" "NWGNU$(LIB_NAME)"
 $(LIB_NAME)_LIBLST_DEPENDS     += NWGNU$(LIB_NAME)
+CCOPT_DEPENDS  += NWGNU$(LIB_NAME)
+else
+CCOPT_DEPENDS  += NWGNUmakefile
 endif
 
 ifeq "$(wildcard NWGNU$(NLM_NAME))" "NWGNU$(NLM_NAME)"
 $(NLM_NAME)_LINKOPT_DEPENDS    += NWGNU$(NLM_NAME)
-CCOPT_DEPENDS  += NWGNU$(NLM_NAME)
-CPPOPT_DEPENDS         += NWGNU$(NLM_NAME)
+CCOPT_DEPENDS  += NWGNU$(NLM_NAME)
+else
+CCOPT_DEPENDS  += NWGNUmakefile
 endif
 
+CPPOPT_DEPENDS = $(CCOPT_DEPENDS)
+
 #
 # Generic compiler rules
 #
@@ -103,10 +97,10 @@ $(AP_WORK)/build/NWGNUversion.inc : $(AP_WORK)/build/nw_ver.awk $(AP_WORK)/inclu
        @echo $(DL)GEN  $@$(DL)
        $(AWK) -f $^ > $@
 
--include $(AP_WORK)/build/NWGNUversion.inc
+-include $(APBUILD)/NWGNUversion.inc
 
 ifneq "$(strip $(VERSION_STR))" ""
-VERSION_INC = $(AP_WORK)/build/NWGNUversion.inc
+VERSION_INC = $(APBUILD)/NWGNUversion.inc
 else
 VERSION                = 2,3,0
 VERSION_STR    = 2.3.0
@@ -199,7 +193,7 @@ endif
 
 else # We must have more than one target library so load the individual makefiles
 
-$(OBJDIR)/%.lib: NWGNU% $(APBUILD)/NWGNUhead.inc $(APBUILD)/NWGNUtail.inc $(APBUILD)/NWGNUenvironment.inc FORCE
+$(OBJDIR)/%.lib: NWGNU% $(STANDARD_DEPENDS) FORCE
        @echo $(DL)Calling $<$(DL)
        $(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
 
@@ -324,7 +318,7 @@ else # more than one target so look for individual makefiles.
 
 ifndef NO_LICENSE_FILE
 
-$(OBJDIR)/%.nlm: NWGNU% $(APBUILD)/NWGNUhead.inc $(APBUILD)/NWGNUtail.inc $(APBUILD)/NWGNUenvironment.inc $(CUSTOM_INI) $(VERSION_INC) FORCE
+$(OBJDIR)/%.nlm: NWGNU% $($(NLM_NAME)_LINKOPT_DEPENDS) FORCE
        @echo $(DL)Calling $<$(DL)
        $(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
        @$(ECHONL)

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index 6bbbad992717875051071451de9c412b2dc9280e..e402428781577bbde51857d518e53c7bcdf9b71c 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -101,7 +101,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME       = modDAVFS
+NLM_NAME       = moddavfs
 
 #
 # This is used by the link '-desc ' directive.
@@ -112,8 +112,7 @@ NLM_DESCRIPTION     = Apache $(VERSION_STR) DAV FileSystem Sub-Module
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME        = modDAVFS Thread
+NLM_THREAD_NAME        = $(NLM_NAME) Thread
 
 #
 # If this is specified, it will override VERSION value in
@@ -155,7 +154,7 @@ NLM_FLAGS   =
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-       $(OBJDIR)/moddavfs.nlm \
+       $(OBJDIR)/$(NLM_NAME).nlm \
        $(EOLIST)
 
 #

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index 0346e060fcf7eba02c909c9a7e13d0338f5de864..b515d272c5bc59dbb22ef3ab90e0a3c15df4b92b 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -101,7 +101,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME       = modDAVLK
+NLM_NAME       = moddavlk
 
 #
 # This is used by the link '-desc ' directive.
@@ -113,7 +113,7 @@ NLM_DESCRIPTION     = Apache $(VERSION_STR) DAV Database Lock Sub-Module
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = modDAVLK Thread
+NLM_THREAD_NAME        = $(NLM_NAME) Thread
 
 #
 # If this is specified, it will override VERSION value in
@@ -155,7 +155,7 @@ NLM_FLAGS   =
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-       $(OBJDIR)/moddavlk.nlm \
+       $(OBJDIR)/$(NLM_NAME).nlm \
        $(EOLIST)
 
 #

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index 01e84386150bb3ac41f55648ee1f2e987263ffbd..bc94a2215b425a6a127317427be908829fe143cf 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -99,7 +99,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME       = mod_DAV
+NLM_NAME       = mod_dav
 
 #
 # This is used by the link '-desc ' directive.
@@ -111,7 +111,7 @@ NLM_DESCRIPTION     = Apache $(VERSION_STR) DAV module
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = mod_DAV
+NLM_THREAD_NAME        = $(NLM_NAME) Thread
 
 #
 # If this is specified, it will override VERSION value in
@@ -160,7 +160,7 @@ XDCDATA             =
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-       $(OBJDIR)/mod_dav.nlm \
+       $(OBJDIR)/$(NLM_NAME).nlm \
        $(EOLIST)
 
 #
@@ -175,12 +175,12 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_dav.o \
-       $(OBJDIR)/props.o \
-       $(OBJDIR)/util.o \
-       $(OBJDIR)/util_lock.o \
        $(OBJDIR)/liveprop.o \
+       $(OBJDIR)/props.o \
        $(OBJDIR)/providers.o \
        $(OBJDIR)/std_liveprop.o \
+       $(OBJDIR)/util.o \
+       $(OBJDIR)/util_lock.o \
        $(EOLIST)
 
 #