diff options
| author | Greg Stein <gstein@apache.org> | 2000-12-20 11:19:06 +0100 |
|---|---|---|
| committer | Greg Stein <gstein@apache.org> | 2000-12-20 11:19:06 +0100 |
| commit | 05de3e2fca5fd4f4aa73b5f7e27fc768313a3243 (patch) | |
| tree | 0aa298452d8cc412c903b9a648e3efdce3748a43 /server/Makefile.in | |
| parent | Get the binbuild.sh script into the CVS repository and start to modify (diff) | |
| download | apache2-05de3e2fca5fd4f4aa73b5f7e27fc768313a3243.tar.xz apache2-05de3e2fca5fd4f4aa73b5f7e27fc768313a3243.zip | |
exports.c was dependent upon delete-exports, but that dependency will always
fail since there is no delete-exports file (thus, exports.c would always get
regenerated, recompiled, and relinked). Instead, we move the delete-exports
target "up" to the "all" target. However, ltlib.mk doesn't allow us to add
things to the "all" target, so we also revise the set of .mk files to use.
also use TARGET_EXPORTS consistently.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87449 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/Makefile.in')
| -rw-r--r-- | server/Makefile.in | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/server/Makefile.in b/server/Makefile.in index 29fee08bc6..1c20a6c733 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -1,9 +1,10 @@ -CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h apache.exports +TARGET_EXPORTS = apache.exports +CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h \ + $(TARGET_EXPORTS) SUBDIRS = mpm -TARGET_EXPORTS = apache.exports LTLIBRARY_NAME = libmain.la LTLIBRARY_SOURCES = \ uri_delims.h test_char.h \ @@ -13,7 +14,10 @@ LTLIBRARY_SOURCES = \ mpm_common.c util_charset.c util_debug.c util_xml.c \ util_filter.c exports.c buildmark.c -include $(top_srcdir)/build/ltlib.mk +targets = delete-exports $(LTLIBRARY_NAME) + +include $(top_srcdir)/build/rules.mk +include $(top_srcdir)/build/library.mk gen_uri_delims_OBJECTS = gen_uri_delims.lo gen_uri_delims: $(gen_uri_delims_OBJECTS) @@ -32,7 +36,8 @@ test_char.h: gen_test_char util_uri.lo: uri_delims.h util.lo: test_char.h -EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports apache.exports +EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports \ + $(TARGET_EXPORTS) delete-exports: @if test -f $(TARGET_EXPORTS); then \ @@ -46,7 +51,7 @@ delete-exports: $(TARGET_EXPORTS): - $(AWK) -f $(top_srcdir)/srclib/apr/helpers/make_export.awk $(top_srcdir)/include/*.h > $@ ; \ + $(AWK) -f $(top_srcdir)/srclib/apr/helpers/make_export.awk $(top_srcdir)/include/*.h > $@ -exports.c: delete-exports $(EXPORT_FILES) +exports.c: $(EXPORT_FILES) (cat $(EXPORT_FILES) | ../build/buildexports.sh ..) > $@ |