From 2f16b9f3b8e8888f5853472fe8025afbfdab7741 Mon Sep 17 00:00:00 2001 From: "Victor J. Orlikowski" Date: Sat, 9 Jun 2001 08:28:08 +0000 Subject: [PATCH] Make this little hack slightly more palatable. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89321 13f79535-47bb-0310-9956-ffa450edef68 --- server/.cvsignore | 2 +- server/Makefile.in | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/.cvsignore b/server/.cvsignore index 05d9298810..7f929030bc 100644 --- a/server/.cvsignore +++ b/server/.cvsignore @@ -9,7 +9,7 @@ test_char.h gen_test_char *.mak exports.c -export_vars.c +export_vars.h Debug Release apache.exports diff --git a/server/Makefile.in b/server/Makefile.in index 7507902053..1805d617cc 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -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 export_vars.c +EXTRACLEAN_TARGETS = exports.c export_vars.h SUBDIRS = mpm @@ -17,7 +17,7 @@ LTLIBRARY_SOURCES = \ util_filter.c exports.c buildmark.c scoreboard.c \ error_bucket.c protocol.c core.c request.c -TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.c \ +TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h \ httpd.exp include $(top_srcdir)/build/rules.mk @@ -55,7 +55,7 @@ $(TARGET_EXPORTS): exports.c: $(EXPORT_FILES) (cat $(EXPORT_FILES) | $(top_srcdir)/build/buildexports.sh $(top_srcdir)) > $@ -export_vars.c: +export_vars.h: $(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???? @@ -67,7 +67,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 export_vars.c +httpd.exp: exports.c export_vars.h echo "#! ." > $@ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@ - $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@ + $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@ -- 2.50.1