You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/03/11 16:41:55 UTC
cvs commit: httpd-2.0/server Makefile.in
trawick 2003/03/11 07:41:55
Modified: server Tag: APACHE_2_0_BRANCH Makefile.in
Log:
commit some missing bits for building exports.c that belongs with
the merge of the out-of-tree-apr feature
Revision Changes Path
No revision
No revision
1.75.2.7 +30 -16 httpd-2.0/server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
retrieving revision 1.75.2.6
retrieving revision 1.75.2.7
diff -u -r1.75.2.6 -r1.75.2.7
--- Makefile.in 6 Dec 2002 19:23:53 -0000 1.75.2.6
+++ Makefile.in 11 Mar 2003 15:41:55 -0000 1.75.2.7
@@ -2,7 +2,7 @@
CLEAN_TARGETS = gen_test_char test_char.h gen_uri_delims uri_delims.h \
ApacheCoreOS2.def
DISTCLEAN_TARGETS = httpd.exp
-EXTRACLEAN_TARGETS = exports.c export_vars.h
+EXTRACLEAN_TARGETS = export_files exports.c export_vars.h
SUBDIRS = mpm
@@ -30,28 +30,42 @@
util.lo: test_char.h
-EXPORT_FILES = $(top_srcdir)/include/*.h \
- $(top_srcdir)/os/$(OS_DIR)/*.h \
- $(top_srcdir)/srclib/apr/include/*.h \
- $(top_srcdir)/srclib/apr-util/include/*.h \
- $(top_srcdir)/modules/http/*.h
+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http
+# If export_files is a dependency here, but we remove it during this stage,
+# when exports.c is generated, make will not detect that export_files is no
+# longer here and deadlock. So, export_files can't be a dependency of
+# delete-exports.
delete-exports:
@if test -f exports.c; then \
- headers="`find $(EXPORT_FILES) -newer exports.c`" ; \
- if test -n "$$headers"; then \
- echo Found newer headers. Will rebuild exports.c. ; \
- echo rm -f exports.c ; \
- rm -f exports.c ; \
- fi \
+ if test -f export_files; then \
+ files=`cat export_files`; \
+ headers="`find $$files -newer exports.c`"; \
+ if test -n "$$headers"; then \
+ echo Found newer headers. Will rebuild exports.c.; \
+ echo rm -f exports.c export_files; \
+ rm -f exports.c export_files; \
+ fi; \
+ else \
+ rm -f exports.c; \
+ fi; \
fi
+export_files:
+ tmp=export_files_unsorted.txt; \
+ rm -f $$tmp && touch $$tmp; \
+ for dir in $(EXPORT_DIRS); do \
+ ls $$dir/*.h >> $$tmp; \
+ done; \
+ sort -u $$tmp > $@; \
+ rm -f $$tmp
+
# full path required to keep BSD make happy
-$(top_builddir)/server/exports.c:
- $(AWK) -f $(top_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@
+$(top_builddir)/server/exports.c: export_files
+ $(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $?` > $@
-export_vars.h:
- $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@
+export_vars.h: export_files
+ $(AWK) -f $(top_srcdir)/build/make_var_export.awk `cat $?` > $@
# wtf does this have to be explicit????
exports.lo: exports.c
Re: cvs commit: httpd-2.0/server Makefile.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Can I ask a stupid question about the fragment below?
I was under the impression that libapr.so and libaprutil.so were exported
from themselves, not from libhttpd.so. Is that assumption correct?
If so, why regen exports.c of libhttpd.so upon changes to libapr/aprutil
headers?
Bill
At 09:41 AM 3/11/2003, trawick@apache.org wrote:
> +EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http
>
> +# If export_files is a dependency here, but we remove it during this stage,
> +# when exports.c is generated, make will not detect that export_files is no
> +# longer here and deadlock. So, export_files can't be a dependency of
> +# delete-exports.
> delete-exports:
> @if test -f exports.c; then \
> - headers="`find $(EXPORT_FILES) -newer exports.c`" ; \
> - if test -n "$$headers"; then \
> - echo Found newer headers. Will rebuild exports.c. ; \
> - echo rm -f exports.c ; \
> - rm -f exports.c ; \
> - fi \
> + if test -f export_files; then \
> + files=`cat export_files`; \
> + headers="`find $$files -newer exports.c`"; \
> + if test -n "$$headers"; then \
> + echo Found newer headers. Will rebuild exports.c.; \
> + echo rm -f exports.c export_files; \
> + rm -f exports.c export_files; \
> + fi; \
> + else \
> + rm -f exports.c; \
> + fi; \
> fi
Re: cvs commit: httpd-2.0/server Makefile.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Can I ask a stupid question about the fragment below?
I was under the impression that libapr.so and libaprutil.so were exported
from themselves, not from libhttpd.so. Is that assumption correct?
If so, why regen exports.c of libhttpd.so upon changes to libapr/aprutil
headers?
Bill
At 09:41 AM 3/11/2003, trawick@apache.org wrote:
> +EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http
>
> +# If export_files is a dependency here, but we remove it during this stage,
> +# when exports.c is generated, make will not detect that export_files is no
> +# longer here and deadlock. So, export_files can't be a dependency of
> +# delete-exports.
> delete-exports:
> @if test -f exports.c; then \
> - headers="`find $(EXPORT_FILES) -newer exports.c`" ; \
> - if test -n "$$headers"; then \
> - echo Found newer headers. Will rebuild exports.c. ; \
> - echo rm -f exports.c ; \
> - rm -f exports.c ; \
> - fi \
> + if test -f export_files; then \
> + files=`cat export_files`; \
> + headers="`find $$files -newer exports.c`"; \
> + if test -n "$$headers"; then \
> + echo Found newer headers. Will rebuild exports.c.; \
> + echo rm -f exports.c export_files; \
> + rm -f exports.c export_files; \
> + fi; \
> + else \
> + rm -f exports.c; \
> + fi; \
> fi