Commit b9438e52 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Rethink the built-in vs shared modules for NetWare. Reposition mod_asis,... 

Rethink the built-in vs shared modules for NetWare.  Reposition mod_asis, mod_actions, mod_cgi, mod_imagemap, mod_userdir and mod_autoindex as shared rather than built-in.

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

NWGNUmakefile

+0 −6
Original line number Diff line number Diff line
@@ -208,14 +208,9 @@ FILES_nlm_objs = \ 
	$(OBJDIR)/log.o \

	$(OBJDIR)/main.o \

	$(OBJDIR)/mod_authz_host.o \

	$(OBJDIR)/mod_actions.o \

	$(OBJDIR)/mod_alias.o \

	$(OBJDIR)/mod_asis.o \

	$(OBJDIR)/mod_autoindex.o \

	$(OBJDIR)/mod_cgi.o \

	$(OBJDIR)/mod_dir.o \

	$(OBJDIR)/mod_env.o \

	$(OBJDIR)/mod_imagemap.o \

	$(OBJDIR)/mod_include.o \

	$(OBJDIR)/mod_log_config.o \

	$(OBJDIR)/mod_mime.o \
@@ -224,7 +219,6 @@ FILES_nlm_objs = \ 
	$(OBJDIR)/mod_nw_ssl.o \

	$(OBJDIR)/mod_setenvif.o \

	$(OBJDIR)/mod_so.o \

	$(OBJDIR)/mod_userdir.o \

	$(OBJDIR)/modules.o \

	$(OBJDIR)/mpm_common.o \

	$(OBJDIR)/mpm_netware.o \

build/mkconfNW.awk

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ BEGIN { 
}



/@@LoadModule@@/ {

    print "#LoadModule actions_module modules/actions.nlm"

    print "#LoadModule auth_basic_module modules/authbasc.nlm"

    print "#LoadModule auth_digest_module modules/authdigt.nlm"

    print "#LoadModule authn_anon_module modules/authnano.nlm"
@@ -47,7 +48,10 @@ BEGIN { 
    print "#LoadModule authz_default_module modules/authzdef.nlm"

    print "#LoadModule authz_groupfile_module modules/authzgrp.nlm"

    print "#LoadModule authz_user_module modules/authzusr.nlm"

    print "#LoadModule asis_module modules/mod_asis.nlm"

    print "LoadModule autoindex_module modules/autoindex.nlm"

    print "#LoadModule cern_meta_module modules/cernmeta.nlm"

    print "#LoadModule cgi_module modules/mod_cgi.nlm"

    print "#LoadModule dav_module modules/mod_dav.nlm"

    print "#LoadModule dav_fs_module modules/moddavfs.nlm"

    print "#LoadModule dav_lock_module modules/moddavlk.nlm"
@@ -56,6 +60,7 @@ BEGIN { 
    print "#LoadModule file_cache_module modules/filecach.nlm"

    print "#LoadModule headers_module modules/headers.nlm"

    print "#LoadModule ident_module modules/modident.nlm"

    print "#LoadModule imagemap_module modules/imagemap.nlm"

    print "#LoadModule info_module modules/info.nlm"

    print "#LoadModule log_forensic_module modules/forensic.nlm"

    print "#LoadModule logio_module modules/modlogio.nlm"
@@ -70,6 +75,7 @@ BEGIN { 
    print "#LoadModule unique_id_module modules/uniqueid.nlm"

    print "#LoadModule usertrack_module modules/usertrk.nlm"

    print "#LoadModule version_module modules/modversion.nlm"

    print "#LoadModule userdir_module modules/userdir.nlm"

    print "#LoadModule vhost_alias_module modules/vhost.nlm"

    print ""

    next

modules/generators/NWGNUautoindex

0 → 100644
+251 −0
Original line number Diff line number Diff line 
#

# Make sure all needed macro's are defined

#



#

# Get the 'head' of the build environment if necessary.  This includes default

# targets and paths to tools

#



ifndef EnvironmentDefined

include $(AP_WORK)\build\NWGNUhead.inc

endif



#

# 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)/modules/http \

			$(APR)/include \

			$(APRUTIL)/include \

			$(APR) \

			$(EOLIST)



#

# These flags will come after CFLAGS

#

XCFLAGS		+= \

			-prefix pre_nw.h \

			$(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		= autoindex



#

# This is used by the link '-desc ' directive. 

# If left blank, NLM_NAME will be used.

#

NLM_DESCRIPTION	= Apache $(VERSION_STR) Autoindex Module



#

# This is used by the '-threadname' directive.  If left blank,

# NLM_NAME Thread will be used.

#

NLM_THREAD_NAME	= Autoindex 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)/autoindex.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_autoindex.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 = \

	autoindex_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

modules/generators/NWGNUmakefile

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ XDCDATA = 
# If there is an NLM target, put it here

#

TARGET_nlm = \

	$(OBJDIR)/mod_asis.nlm \

	$(OBJDIR)/autoindex.nlm \

	$(OBJDIR)/mod_cgi.nlm \

	$(OBJDIR)/info.nlm \

	$(OBJDIR)/status.nlm \

	$(EOLIST)

modules/generators/NWGNUmod_asis

0 → 100644
+251 −0
Original line number Diff line number Diff line 
#

# Make sure all needed macro's are defined

#



#

# Get the 'head' of the build environment if necessary.  This includes default

# targets and paths to tools

#



ifndef EnvironmentDefined

include $(AP_WORK)\build\NWGNUhead.inc

endif



#

# 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)/modules/http \

			$(APR)/include \

			$(APRUTIL)/include \

			$(APR) \

			$(EOLIST)



#

# These flags will come after CFLAGS

#

XCFLAGS		+= \

			-prefix pre_nw.h \

			$(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		= mod_asis



#

# This is used by the link '-desc ' directive. 

# If left blank, NLM_NAME will be used.

#

NLM_DESCRIPTION	= Apache $(VERSION_STR) ASIS Module



#

# This is used by the '-threadname' directive.  If left blank,

# NLM_NAME Thread will be used.

#

NLM_THREAD_NAME	= Mod_asis 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)/mod_asis.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_asis.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 = \

	asis_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