From 6573f0adfdc1f986e0e99e1d8ff918e6cdf918e9 Mon Sep 17 00:00:00 2001 From: Bradley Nicholes Date: Sat, 23 Nov 2002 00:32:01 +0000 Subject: [PATCH] Makefile change required to move mod_ext_filter out of experimental git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97603 13f79535-47bb-0310-9956-ffa450edef68 --- modules/NWGNUmakefile | 7 +- modules/experimental/NWGNUmakefile | 1 - modules/filters/NWGNUmakefile | 253 +++++++++++++++++++++++++++++ 3 files changed, 254 insertions(+), 7 deletions(-) create mode 100644 modules/filters/NWGNUmakefile diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile index 4c7cfa89b2..d7f847cb25 100644 --- a/modules/NWGNUmakefile +++ b/modules/NWGNUmakefile @@ -14,6 +14,7 @@ SUBDIRS = \ mappers \ metadata \ proxy \ + filters \ $(EOLIST) #If the mod_edir directory exists then build the mod_edir module @@ -22,12 +23,6 @@ SUBDIRS += mod_edir \ $(EOLIST) endif -# If the zlib libraries source exists then build the mod_deflate module -ifeq "$(wildcard $(AP_WORK)\srclib\zlib)" "$(AP_WORK)\srclib\zlib" -SUBDIRS += filters \ - $(EOLIST) -endif - # # Get the 'head' of the build environment. This includes default targets and # paths to tools diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile index 6045155770..24a1e3a527 100644 --- a/modules/experimental/NWGNUmakefile +++ b/modules/experimental/NWGNUmakefile @@ -156,7 +156,6 @@ TARGET_nlm = \ $(OBJDIR)/mod_cach.nlm \ $(OBJDIR)/mem_cach.nlm \ $(OBJDIR)/dsk_cach.nlm \ - $(OBJDIR)/extfiltr.nlm \ $(EOLIST) # If LDAPSDK has been defined then build the auth_ldap module diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile new file mode 100644 index 0000000000..d9ddfff036 --- /dev/null +++ b/modules/filters/NWGNUmakefile @@ -0,0 +1,253 @@ +# +# Declare the sub-directories to be built here +# + +SUBDIRS = \ + $(EOLIST) + +# +# Get the 'head' of the build environment. This includes default targets and +# paths to tools +# + +include $(AP_WORK)\build\NWGNUhead.inc + +# +# build this level's files + +# +# Make sure all needed macro's are defined +# + +# +# These directories will be at the beginning of the include list, followed by +# INCDIRS +# +XINCDIRS += \ + $(EOLIST) + +# +# These flags will come after CFLAGS +# +XCFLAGS += \ + $(EOLIST) + +# +# These defines will come after DEFINES +# +XDEFINES += \ + $(EOLIST) + +# +# These flags will be added to the link.opt file +# +XLFLAGS += \ + $(EOLIST) + +# +# These values will be appended to the correct variables based on the value of +# RELEASE +# +ifeq "$(RELEASE)" "debug" +XINCDIRS += \ + $(EOLIST) + +XCFLAGS += \ + $(EOLIST) + +XDEFINES += \ + $(EOLIST) + +XLFLAGS += \ + $(EOLIST) +endif + +ifeq "$(RELEASE)" "noopt" +XINCDIRS += \ + $(EOLIST) + +XCFLAGS += \ + $(EOLIST) + +XDEFINES += \ + $(EOLIST) + +XLFLAGS += \ + $(EOLIST) +endif + +ifeq "$(RELEASE)" "release" +XINCDIRS += \ + $(EOLIST) + +XCFLAGS += \ + $(EOLIST) + +XDEFINES += \ + $(EOLIST) + +XLFLAGS += \ + $(EOLIST) +endif + +# +# These are used by the link target if an NLM is being generated +# This is used by the link 'name' directive to name the nlm. If left blank +# TARGET_nlm (see below) will be used. +# +NLM_NAME = + +# +# This is used by the link '-desc ' directive. +# If left blank, NLM_NAME will be used. +# +NLM_DESCRIPTION = + +# +# This is used by the '-threadname' directive. If left blank, +# NLM_NAME Thread will be used. +# +NLM_THREAD_NAME = + +# +# If this is specified, it will override VERSION value in +# $(AP_WORK)\build\NWGNUenvironment.inc +# +NLM_VERSION = + +# +# If this is specified, it will override the default of 64K +# +NLM_STACK_SIZE = + + +# +# If this is specified it will be used by the link '-entry' directive +# +NLM_ENTRY_SYM = + +# +# If this is specified it will be used by the link '-exit' directive +# +NLM_EXIT_SYM = + +# +# If this is specified it will be used by the link '-check' directive +# +NLM_CHECK_SYM = + +# +# If these are specified it will be used by the link '-flags' directive +# +NLM_FLAGS = + +# +# If this is specified it will be linked in with the XDCData option in the def +# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled +# by setting APACHE_UNIPROC in the environment +# +XDCDATA = + +# +# If there is an NLM target, put it here +# +TARGET_nlm = \ + $(OBJDIR)/extfiltr.nlm \ + $(EOLIST) + +# If the zlib libraries source exists then build the mod_deflate module +ifeq "$(wildcard $(AP_WORK)\srclib\zlib)" "$(AP_WORK)\srclib\zlib" +TARGET_nlm += $(OBJDIR)/deflate.nlm \ + $(EOLIST) +else +TARGET_nlm += $(OBJDIR)/extfiltr.nlm \ + $(EOLIST) +endif + +# +# If there is an LIB target, put it here +# +TARGET_lib = \ + $(EOLIST) + +# +# These are the OBJ files needed to create the NLM target above. +# Paths must all use the '/' character +# +FILES_nlm_objs = \ + $(EOLIST) + +# +# These are the LIB files needed to create the NLM target above. +# These will be added as a library command in the link.opt file. +# +FILES_nlm_libs = \ + $(EOLIST) + +# +# These are the modules that the above NLM target depends on to load. +# These will be added as a module command in the link.opt file. +# +FILES_nlm_modules = \ + $(EOLIST) + +# +# If the nlm has a msg file, put it's path here +# +FILE_nlm_msg = + +# +# If the nlm has a hlp file put it's path here +# +FILE_nlm_hlp = + +# +# If this is specified, it will override $(NWOS)\copyright.txt. +# +FILE_nlm_copyright = + +# +# Any additional imports go here +# +FILES_nlm_Ximports = \ + $(EOLIST) + +# +# Any symbols exported to here +# +FILES_nlm_exports = \ + $(EOLIST) + +# +# These are the OBJ files needed to create the LIB target above. +# Paths must all use the '/' character +# +FILES_lib_objs = \ + $(EOLIST) + +# +# implement targets and dependancies (leave this section alone) +# + +libs :: $(OBJDIR) $(TARGET_lib) + +nlms :: libs $(TARGET_nlm) + +# +# Updated this target to create necessary directories and copy files to the +# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# +install :: nlms FORCE + copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.* + +# +# Any specialized rules here +# + +# +# Include the 'tail' makefile that has targets that depend on variables defined +# in this makefile +# + +include $(AP_WORK)\build\NWGNUtail.inc + -- 2.40.0