You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2007/11/21 22:01:11 UTC
svn commit: r597208 - in /httpd/httpd/trunk/modules: NWGNUmakefile
examples/NWGNUexample_hooks examples/NWGNUexample_ipc examples/NWGNUhooks
examples/NWGNUmakefile experimental/NWGNUmakefile
Author: bnicholes
Date: Wed Nov 21 13:01:09 2007
New Revision: 597208
URL: http://svn.apache.org/viewvc?rev=597208&view=rev
Log:
Fix up the NetWare build due to the rearranging of the examples and experimental directories.
Added:
httpd/httpd/trunk/modules/examples/NWGNUexample_hooks
- copied, changed from r597205, httpd/httpd/trunk/modules/examples/NWGNUhooks
httpd/httpd/trunk/modules/examples/NWGNUexample_ipc
Removed:
httpd/httpd/trunk/modules/examples/NWGNUhooks
Modified:
httpd/httpd/trunk/modules/NWGNUmakefile
httpd/httpd/trunk/modules/examples/NWGNUmakefile
httpd/httpd/trunk/modules/experimental/NWGNUmakefile
Modified: httpd/httpd/trunk/modules/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/NWGNUmakefile?rev=597208&r1=597207&r2=597208&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/NWGNUmakefile Wed Nov 21 13:01:09 2007
@@ -11,6 +11,7 @@
dav\fs \
dav\lock \
echo \
+ examples \
generators \
loggers \
mappers \
Copied: httpd/httpd/trunk/modules/examples/NWGNUexample_hooks (from r597205, httpd/httpd/trunk/modules/examples/NWGNUhooks)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/NWGNUexample_hooks?p2=httpd/httpd/trunk/modules/examples/NWGNUexample_hooks&p1=httpd/httpd/trunk/modules/examples/NWGNUhooks&r1=597205&r2=597208&rev=597208&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/NWGNUhooks (original)
+++ httpd/httpd/trunk/modules/examples/NWGNUexample_hooks Wed Nov 21 13:01:09 2007
@@ -221,7 +221,7 @@
# Any symbols exported to here
#
FILES_nlm_exports = \
- example_module \
+ example_hooks_module \
$(EOLIST)
#
Added: httpd/httpd/trunk/modules/examples/NWGNUexample_ipc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/NWGNUexample_ipc?rev=597208&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/examples/NWGNUexample_ipc (added)
+++ httpd/httpd/trunk/modules/examples/NWGNUexample_ipc Wed Nov 21 13:01:09 2007
@@ -0,0 +1,259 @@
+#
+# 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 += \
+ $(AP_WORK)/include \
+ $(NWOS) \
+ $(AP_WORK)/modules/arch/netware \
+ $(AP_WORK)/server/mpm/netware \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
+ $(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 = example_ipc
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION = Apache $(VERSION_STR) Example IPC Callback Handler Module
+
+#
+# This is used by the '-threadname' directive. If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME = Example IPC Callback Handler Module
+
+#
+# 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 = 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM = _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM = _LibCPostlude
+
+#
+# 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 = AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# 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)/example_ipc.nlm \
+ $(EOLIST)
+
+#
+# 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 = \
+ $(OBJDIR)/mod_example_ipc.o \
+ $(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 = \
+ libcpre.o \
+ $(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 = \
+ aprlib \
+ libc \
+ $(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 = \
+ @$(APR)/aprlib.imp \
+ @$(NWOS)/httpd.imp \
+ @libc.imp \
+ $(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+ example_ipc_module \
+ $(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
+
+#
+# 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
+
+
Modified: httpd/httpd/trunk/modules/examples/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/NWGNUmakefile?rev=597208&r1=597207&r2=597208&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/examples/NWGNUmakefile Wed Nov 21 13:01:09 2007
@@ -160,7 +160,8 @@
# it twice to allow it parent NWGNUmakefile to work properly. If another
# submakefile is added, the extra reference to example.nlm should be removed.
TARGET_nlm = \
- $(OBJDIR)/example.nlm \
+ $(OBJDIR)/example_hooks.nlm \
+ $(OBJDIR)/example_ipc.nlm \
$(OBJDIR)/case_flt.nlm \
$(OBJDIR)/case_flt_in.nlm \
$(EOLIST)
Modified: httpd/httpd/trunk/modules/experimental/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/experimental/NWGNUmakefile?rev=597208&r1=597207&r2=597208&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/experimental/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/experimental/NWGNUmakefile Wed Nov 21 13:01:09 2007
@@ -151,15 +151,16 @@
#
# If there is an NLM target, put it here
#
-# We are referencing example.nlm twice to get around a known issue with the
+# We are referencing substitute.nlm twice to get around a known issue with the
# makefiles. Normally if there is only one element to be built within a
# directory, the makefile for the single element would be called NWGNUmakefile.
# But if there are multiples, the parent NWGNUmakefile must reference more
# than one submakefile. Because the experimental directory might vary in the
# number of submakefiles, but for the moment only contains one, we reference
# it twice to allow it parent NWGNUmakefile to work properly. If another
-# submakefile is added, the extra reference to example.nlm should be removed.
+# submakefile is added, the extra reference to substitute.nlm should be removed.
TARGET_nlm = \
+ $(OBJDIR)/substitute.nlm \
$(OBJDIR)/substitute.nlm \
$(EOLIST)