Clean up the makefile

Bradley Nicholes · Bradley Nicholes · commit 669347330c42 · 2004-08-16T21:55:26.000Z
Submitted by: Guenter Knauf <fuankg@apache.org> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104684 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
@@ -30,7 +30,7 @@ XINCDIRS	+= \
 # These flags will come after CFLAGS
 #
 XCFLAGS		+= \
-			-prefix pre_nw.h \
+			-relax_pointers \
 			$(EOLIST)
 
 #
@@ -53,28 +53,28 @@ ifeq "$(RELEASE)" "debug"
 XINCDIRS	+= \
 			$(EOLIST)
 
-XCFLAGS		+= -relax_pointers \
+XCFLAGS		+= \
 			$(EOLIST)
 
 XDEFINES	+= \
 			$(EOLIST)
 
 XLFLAGS		+= \
-		   	$(EOLIST)
+			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
 XINCDIRS	+= \
 			$(EOLIST)
 
-XCFLAGS		+= -relax_pointers \
+XCFLAGS		+= \
 			$(EOLIST)
 
 XDEFINES	+= \
 			$(EOLIST)
 
 XLFLAGS		+= \
-		   	$(EOLIST)
+			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -114,7 +114,7 @@ NLM_THREAD_NAME	= Proxy AJP Module
 # If this is specified, it will override VERSION value in 
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION		=
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -140,14 +140,14 @@ NLM_CHECK_SYM	=
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		=  AUTOUNLOAD, PSEUDOPREEMPTION
+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         = 
+XDCDATA		= 
 
 #
 # If there is an NLM target, put it here
@@ -180,7 +180,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-   	libcpre.o \
+	libcpre.o \
 	$(EOLIST)
 
 #
@@ -230,13 +230,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
 	proxy_ajp_module \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-		$(EOLIST)
+	$(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ XINCDIRS += \`
`30`	`30`	`# These flags will come after CFLAGS`
`31`	`31`	`#`
`32`	`32`	`XCFLAGS += \`
`33`		`- -prefix pre_nw.h \`
	`33`	`+ -relax_pointers \`
`34`	`34`	`$(EOLIST)`
`35`	`35`
`36`	`36`	`#`
`@@ -53,28 +53,28 @@ ifeq "$(RELEASE)" "debug"`
`53`	`53`	`XINCDIRS += \`
`54`	`54`	`$(EOLIST)`
`55`	`55`
`56`		`-XCFLAGS += -relax_pointers \`
	`56`	`+XCFLAGS += \`
`57`	`57`	`$(EOLIST)`
`58`	`58`
`59`	`59`	`XDEFINES += \`
`60`	`60`	`$(EOLIST)`
`61`	`61`
`62`	`62`	`XLFLAGS += \`
`63`		`- $(EOLIST)`
	`63`	`+ $(EOLIST)`
`64`	`64`	`endif`
`65`	`65`
`66`	`66`	`ifeq "$(RELEASE)" "noopt"`
`67`	`67`	`XINCDIRS += \`
`68`	`68`	`$(EOLIST)`
`69`	`69`
`70`		`-XCFLAGS += -relax_pointers \`
	`70`	`+XCFLAGS += \`
`71`	`71`	`$(EOLIST)`
`72`	`72`
`73`	`73`	`XDEFINES += \`
`74`	`74`	`$(EOLIST)`
`75`	`75`
`76`	`76`	`XLFLAGS += \`
`77`		`- $(EOLIST)`
	`77`	`+ $(EOLIST)`
`78`	`78`	`endif`
`79`	`79`
`80`	`80`	`ifeq "$(RELEASE)" "release"`
`@@ -114,7 +114,7 @@ NLM_THREAD_NAME = Proxy AJP Module`
`114`	`114`	`# If this is specified, it will override VERSION value in`
`115`	`115`	`# $(AP_WORK)\build\NWGNUenvironment.inc`
`116`	`116`	`#`
`117`		`-NLM_VERSION =`
	`117`	`+NLM_VERSION =`
`118`	`118`
`119`	`119`	`#`
`120`	`120`	`# If this is specified, it will override the default of 64K`
`@@ -140,14 +140,14 @@ NLM_CHECK_SYM =`
`140`	`140`	`#`
`141`	`141`	`# If these are specified it will be used by the link '-flags' directive`
`142`	`142`	`#`
`143`		`-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION`
	`143`	`+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION`
`144`	`144`
`145`	`145`	`#`
`146`	`146`	`# If this is specified it will be linked in with the XDCData option in the def`
`147`	`147`	`# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled`
`148`	`148`	`# by setting APACHE_UNIPROC in the environment`
`149`	`149`	`#`
`150`		`-XDCDATA =`
	`150`	`+XDCDATA =`
`151`	`151`
`152`	`152`	`#`
`153`	`153`	`# If there is an NLM target, put it here`
`@@ -180,7 +180,7 @@ FILES_nlm_objs = \`
`180`	`180`	`# These will be added as a library command in the link.opt file.`
`181`	`181`	`#`
`182`	`182`	`FILES_nlm_libs = \`
`183`		`- libcpre.o \`
	`183`	`+ libcpre.o \`
`184`	`184`	`$(EOLIST)`
`185`	`185`
`186`	`186`	`#`
`@@ -230,13 +230,13 @@ FILES_nlm_Ximports = \`
`230`	`230`	`FILES_nlm_exports = \`
`231`	`231`	`proxy_ajp_module \`
`232`	`232`	`$(EOLIST)`
`233`		`-`
	`233`	`+`
`234`	`234`	`#`
`235`	`235`	`# These are the OBJ files needed to create the LIB target above.`
`236`	`236`	`# Paths must all use the '/' character`
`237`	`237`	`#`
`238`	`238`	`FILES_lib_objs = \`
`239`		`- $(EOLIST)`
	`239`	`+ $(EOLIST)`
`240`	`240`
`241`	`241`	`#`
`242`	`242`	`# implement targets and dependancies (leave this section alone)`