Commit 30061c02 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

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
parent fe6c91d9

build/NWGNUtail.inc

+15 −21
Changes for build/NWGNUtail.inc: 15 added lines, 21 removed lines.
Original line number Diff line number Diff line
@@ -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)

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)

modules/dav/fs/NWGNUmakefile

+3 −4
Changes for modules/dav/fs/NWGNUmakefile: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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)



#

modules/dav/lock/NWGNUmakefile

+3 −3
Changes for modules/dav/lock/NWGNUmakefile: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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)



#

modules/dav/main/NWGNUmakefile

+6 −6
Changes for modules/dav/main/NWGNUmakefile: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -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)



#