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 2002/05/01 00:16:52 UTC

cvs commit: httpd-2.0/modules/experimental NWGNUmod_cach NWGNUmem_cach NWGNUdsk_cach NWGNUmakefile

bnicholes    02/04/30 15:16:51

  Modified:    modules/experimental NWGNUmakefile
  Added:       modules/experimental NWGNUmod_cach NWGNUmem_cach
                        NWGNUdsk_cach
  Log:
  NetWare make files for building experimental module mod_cache and its
  associated support modules.
  
  Submitted by: Jean-Jacques Clar [jjclar@novell.com]
  
  Revision  Changes    Path
  1.2       +3 -0      httpd-2.0/modules/experimental/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/NWGNUmakefile,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NWGNUmakefile	30 Apr 2002 21:54:53 -0000	1.1
  +++ NWGNUmakefile	30 Apr 2002 22:16:51 -0000	1.2
  @@ -154,6 +154,9 @@
   TARGET_nlm = \
   	$(OBJDIR)/deflate.nlm \
   	$(OBJDIR)/example.nlm \
  +	$(OBJDIR)/mod_cach.nlm \
  +	$(OBJDIR)/mem_cach.nlm \
  +	$(OBJDIR)/dsk_cach.nlm \
   	$(EOLIST)
   
   #
  
  
  
  1.1                  httpd-2.0/modules/experimental/NWGNUmod_cach
  
  Index: NWGNUmod_cach
  ===================================================================
  #
  # 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)/srclib/apr/include \
  			$(AP_WORK)/srclib/include/arch/NetWare \
  			$(AP_WORK)/srclib/apr-util/include \
  			$(AP_WORK)/include \
  			$(AP_WORK)/os/NetWare \
  			$(AP_WORK)/server/mpm/NetWare \
  			$(AP_WORK)/srclib/pcre \
  			$(NWOS) \
  			$(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	+= \
  			-DDEBUG \
  			$(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_cach
  
  #
  # This is used by the link '-desc ' directive. 
  # If left blank, NLM_NAME will be used.
  #
  NLM_DESCRIPTION	= Apache Cache module
  
  #
  # This is used by the '-threadname' directive.  If left blank,
  # NLM_NAME Thread will be used.
  #
  NLM_THREAD_NAME	= mod_cach
  
  #
  # 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	= 65536
   
  
  #
  # 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 this is 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         = 
  
  #
  # Declare all target files (you must add your files here)
  #
  
  #
  # If there is an NLM target, put it here
  #
  TARGET_nlm = \
  	$(OBJDIR)/mod_cach.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)/cache_util.o \
  	$(OBJDIR)/cache_storage.o \
  	$(OBJDIR)/mod_cache.o \
  	$(EOLIST)
  
  #	$(OBJDIR)/mod_mem_cache.o \
  #
  # 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 = \
  	Apache2 \
  	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 = \
  	@libc.imp \
  	@$(APR)/aprlib.imp \
  	@httpd.imp \
  	@netware.imp \
  	$(EOLIST)
   
  #   
  # Any symbols exported to here
  #
  FILES_nlm_exports = \
  	generate_name \
  	ap_cache_hex2usec \
  	ap_cache_usec2hex \
  	cache_hook_create_entity \
  	cache_hook_open_entity \
  	cache_hook_remove_url \
  	cache_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
  	copy $(OBJDIR)\mod_dav.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
  
  
  	
  
  
  
  1.1                  httpd-2.0/modules/experimental/NWGNUmem_cach
  
  Index: NWGNUmem_cach
  ===================================================================
  #
  # 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)/srclib/apr/include \
  			$(AP_WORK)/srclib/include/arch/NetWare \
  			$(AP_WORK)/srclib/apr-util/include \
  			$(AP_WORK)/include \
  			$(AP_WORK)/os/NetWare \
  			$(AP_WORK)/server/mpm/NetWare \
  			$(AP_WORK)/srclib/pcre \
  			../main \
  			$(NWOS) \
  			$(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	+= \
  			-DDEBUG \
  			$(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		= mem_cach
  
  #
  # This is used by the link '-desc ' directive. 
  # If left blank, NLM_NAME will be used.
  #
  NLM_DESCRIPTION	= Apache Memory Cache module
  
  #
  # This is used by the '-threadname' directive.  If left blank,
  # NLM_NAME Thread will be used.
  #
  NLM_THREAD_NAME	= mem_cach
  
  #
  # 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	= 65536
   
  
  #
  # 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 this is 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         = 
  
  #
  # Declare all target files (you must add your files here)
  #
  
  #
  # If there is an NLM target, put it here
  #
  TARGET_nlm = \
  	$(OBJDIR)/mem_cach.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_mem_cache.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 = \
  	Apache2 \
  	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 = \
  	@libc.imp \
  	@$(APR)/aprlib.imp \
  	@httpd.imp \
  	cache_hook_create_entity \
  	cache_hook_open_entity \
  	cache_hook_remove_url \
  	$(EOLIST)
   
  #   
  # Any symbols exported to here
  #
  FILES_nlm_exports = \
  	mem_cache_module \
  	$(EOLIST)
  	
  #	@cache.imp \
  #   
  # 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)\mem_cach.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
  
  
  	
  
  
  
  1.1                  httpd-2.0/modules/experimental/NWGNUdsk_cach
  
  Index: NWGNUdsk_cach
  ===================================================================
  #
  # 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)/srclib/apr/include \
  			$(AP_WORK)/srclib/include/arch/NetWare \
  			$(AP_WORK)/srclib/apr-util/include \
  			$(AP_WORK)/include \
  			$(AP_WORK)/os/NetWare \
  			$(AP_WORK)/server/mpm/NetWare \
  			$(AP_WORK)/srclib/pcre \
  			../main \
  			$(NWOS) \
  			$(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		= dsk_cach
  
  #
  # This is used by the link '-desc ' directive. 
  # If left blank, NLM_NAME will be used.
  #
  NLM_DESCRIPTION	= Apache Memory Cache module
  
  #
  # This is used by the '-threadname' directive.  If left blank,
  # NLM_NAME Thread will be used.
  #
  NLM_THREAD_NAME	= dsk_cach
  
  #
  # 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	= 65536
   
  
  #
  # 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 this is 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         = 
  
  #
  # Declare all target files (you must add your files here)
  #
  
  #
  # If there is an NLM target, put it here
  #
  TARGET_nlm = \
  	$(OBJDIR)/dsk_cach.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_disk_cache.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 = \
  	Apache2 \
  	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 = \
  	@libc.imp \
  	@$(APR)/aprlib.imp \
  	@httpd.imp \
  	generate_name \
  	ap_cache_hex2usec \
  	ap_cache_usec2hex \
  	cache_hook_create_entity \
  	cache_hook_open_entity \
  	cache_hook_remove_url \
  	$(EOLIST)
   
  #   
  # Any symbols exported to here
  #
  FILES_nlm_exports = \
  	disk_cache_module \
  	$(EOLIST)
  	
  #	@cache.imp \
  #   
  # 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)\mod_dav.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