AIX doesn't understand -maxdepth.
>
> wsanchez 2002/11/28 23:21:07
>
> Modified: server .cvsignore Makefile.in
> . acinclude.m4
> Log:
> If apr and apr-util are not in-tree, we need to be able to find the
> include directory for each in order to generate the server/exports.c
> and server/export_vars.h files.
>
> configure.in:
> - Provide APR_INCLUDEDIR, APU_INCLUDEDIR.
>
> server/Makefile.in:
> - Use $APR_INCLUDEDIR $APU_INCLUDEDIR vars.
> - Add export_files target to generate a list of headers with symbols
> to export, use that list to generate exports.c and export_vars.h.
>
> Revision Changes Path
> 1.16 +1 -0 httpd-2.0/server/.cvsignore
>
> Index: .cvsignore
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/server/.cvsignore,v
> retrieving revision 1.15
> retrieving revision 1.16
> diff -u -r1.15 -r1.16
> --- .cvsignore 5 Jun 2002 14:56:45 -0000 1.15
> +++ .cvsignore 29 Nov 2002 07:21:07 -0000 1.16
> @@ -5,6 +5,7 @@
> *.la
> test_char.h
> gen_test_char
> +export_files
> exports.c
> export_vars.h
> Debug
>
>
>
> 1.76 +22 -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
> retrieving revision 1.76
> diff -u -r1.75 -r1.76
> --- Makefile.in 8 Oct 2002 15:12:43 -0000 1.75
> +++ Makefile.in 29 Nov 2002 07:21:07 -0000 1.76
> @@ -30,28 +30,34 @@
>
> 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
>
> -delete-exports:
> +delete-exports: export_files
> @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 \
> + files=`cat $<`; \
> + headers="`find $$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; \
> fi
>
> +export_files:
> + tmp=export_files_unsorted.txt; \
> + rm -f $$tmp && touch $$tmp; \
> + for dir in $(EXPORT_DIRS); do \
> + find $$dir -maxdepth 1 -type f -name '*.h' >> $$tmp; \
> + done; \
> + cat $$tmp | sort | uniq > $@; \
> + 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
>
>
>
> 1.134 +2 -0 httpd-2.0/acinclude.m4
>
> Index: acinclude.m4
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
> retrieving revision 1.133
> retrieving revision 1.134
> diff -u -r1.133 -r1.134
> --- acinclude.m4 14 Nov 2002 14:17:03 -0000 1.133
> +++ acinclude.m4 29 Nov 2002 07:21:07 -0000 1.134
> @@ -88,7 +88,9 @@
> APACHE_SUBST(INSTALL_PROG_FLAGS)
> APACHE_SUBST(DSO_MODULES)
> APACHE_SUBST(APR_BINDIR)
> + APACHE_SUBST(APR_INCLUDEDIR)
> APACHE_SUBST(APU_BINDIR)
> + APACHE_SUBST(APU_INCLUDEDIR)
>
> abs_srcdir="`(cd $srcdir && pwd)`"
>
>
>
>
>
