Commit 01239d67 authored by Victor J. Orlikowski's avatar Victor J. Orlikowski
Browse files

xlC isn't as accepting as gcc; make things tolerable for it. 


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

server/.cvsignore

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ test_char.h 
gen_test_char

*.mak

exports.c

export_vars.c

Debug

Release

apache.exports

server/Makefile.in

+7 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ TARGET_EXPORTS = apache.exports 
CLEAN_TARGETS = gen_test_char test_char.h gen_uri_delims uri_delims.h \

	$(TARGET_EXPORTS) ApacheCoreOS2.def

DISTCLEAN_TARGETS = httpd.exp

EXTRACLEAN_TARGETS = exports.c

EXTRACLEAN_TARGETS = exports.c export_vars.c



SUBDIRS = mpm
@@ -14,7 +14,7 @@ LTLIBRARY_SOURCES = \ 
	util_script.c util_md5.c util_cfgtree.c util_ebcdic.c \

	rfc1413.c connection.c listen.c \

        mpm_common.c util_charset.c util_debug.c util_xml.c \

	util_filter.c exports.c buildmark.c scoreboard.c \

	util_filter.c exports.c export_vars.c buildmark.c scoreboard.c \

	error_bucket.c protocol.c core.c request.c



TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) httpd.exp
@@ -54,6 +54,9 @@ $(TARGET_EXPORTS): 
exports.c: $(EXPORT_FILES)

	(cat $(EXPORT_FILES) | $(top_srcdir)/build/buildexports.sh $(top_srcdir)) > $@



export_vars.c:

	$(AWK) -f $(top_srcdir)/build/make_var_export.awk $(top_srcdir)/include/*.h $(top_srcdir)/os/$(OS_DIR)/*.h $(top_srcdir)/srclib/apr/include/*.h $(top_srcdir)/srclib/apr-util/include/*.h > $@



# wtf does this have to be explicit????

exports.lo: exports.c
@@ -63,7 +66,7 @@ ApacheCoreOS2.def: exports.c $(top_srcdir)/os/$(OS_DIR)/core_header.def 
	$(CPP) $< $(ALL_CPPFLAGS) $(ALL_INCLUDES) | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/  "\1"/' >> $@



# Rule to make exp file for AIX DSOs

httpd.exp: exports.c

httpd.exp: exports.c export_vars.c

	echo "#! ." > $@

	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@

	$(AWK) -f $(top_srcdir)/build/make_var_export.awk $(top_srcdir)/include/*.h $(top_srcdir)/os/$(OS_DIR)/*.h $(top_srcdir)/srclib/apr/include/*.h $(top_srcdir)/srclib/apr-util/include/*.h | $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) - | sed -e 's/^\# .*//' | sed -e '/^$$/d' >> $@
 
	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@