You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dg...@apache.org on 2001/01/06 22:47:50 UTC
cvs commit: httpd-2.0/support Makefile.in
dgaudet 01/01/06 13:47:50
Modified: . Makefile.in acinclude.m4
build build2.mk rules.mk
server Makefile.in
srclib/pcre Makefile.in
support Makefile.in
Log:
- add some missing distclean targets
- use DISTCLEAN_TARGETS and CLEAN_TARGETS everywhere (to be consistent
with other macros and with APR)
- warn that aclocal.m4 is a generated file
Revision Changes Path
1.52 +3 -2 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Makefile.in 2000/12/28 06:08:30 1.51
+++ Makefile.in 2001/01/06 21:47:47 1.52
@@ -16,9 +16,10 @@
phony_targets = $(srcdir)/buildmark.c
install_targets = install-conf install-htdocs install-icons install-other \
install-cgi install-include install-support install-suexec
-DISTCLEANFILES = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
+DISTCLEAN_TARGETS = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
configure generated_lists include/ap_config_auto.h \
- include/ap_config_auto.h.in include/ap_config_path.h install-sh
+ include/ap_config_auto.h.in include/ap_config_path.h install-sh \
+ missing mkinstalldirs
include $(top_srcdir)/build/rules.mk
include $(top_srcdir)/build/program.mk
1.60 +1 -0 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- acinclude.m4 2000/12/23 02:52:08 1.59
+++ acinclude.m4 2001/01/06 21:47:47 1.60
@@ -214,6 +214,7 @@
])dnl
dnl
AC_DEFUN(APACHE_MODPATH_FINISH,[
+ echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
echo "static = $modpath_static" >> $modpath_current/modules.mk
echo "shared = $modpath_shared" >> $modpath_current/modules.mk
if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
1.26 +3 -1 httpd-2.0/build/build2.mk
Index: build2.mk
===================================================================
RCS file: /home/cvs/httpd-2.0/build/build2.mk,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build2.mk 2000/12/31 10:34:04 1.25
+++ build2.mk 2001/01/06 21:47:48 1.26
@@ -86,7 +86,9 @@
aclocal.m4: acinclude.m4 srclib/apr/apr_common.m4 srclib/apr/hints.m4 $(libtool_m4)
@echo rebuilding $@
- @cat acinclude.m4 $(libtool_m4) > $@
+ @echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf" >$@
+ @echo "dnl edits here will be lost" >>$@
+ @cat acinclude.m4 $(libtool_m4) >> $@
$(LT_TARGETS):
libtoolize $(AMFLAGS) --force
1.35 +2 -2 httpd-2.0/build/rules.mk
Index: rules.mk
===================================================================
RCS file: /home/cvs/httpd-2.0/build/rules.mk,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rules.mk 2000/12/19 23:37:47 1.34
+++ rules.mk 2001/01/06 21:47:48 1.35
@@ -182,12 +182,12 @@
clean: clean-recursive clean-x
clean-x:
- rm -f $(targets) *.slo *.lo *.la *.o $(CLEANFILES)
+ rm -f $(targets) *.slo *.lo *.la *.o $(CLEAN_TARGETS)
rm -rf .libs
distclean: distclean-recursive clean-x
rm -f config.cache config.log config.status config_vars.mk libtool \
- stamp-h Makefile shlibtool .deps $(DISTCLEANFILES)
+ stamp-h Makefile shlibtool .deps $(DISTCLEAN_TARGETS)
include $(builddir)/.deps
1.31 +1 -1 httpd-2.0/server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.in 2000/12/31 11:35:50 1.30
+++ Makefile.in 2001/01/06 21:47:48 1.31
@@ -1,6 +1,6 @@
TARGET_EXPORTS = apache.exports
-CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h \
+CLEAN_TARGETS = gen_test_char gen_uri_delims test_char.h uri_delims.h \
$(TARGET_EXPORTS)
SUBDIRS = mpm
1.10 +2 -2 httpd-2.0/srclib/pcre/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/srclib/pcre/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 2000/08/22 04:25:36 1.9
+++ Makefile.in 2001/01/06 21:47:49 1.10
@@ -1,8 +1,8 @@
LTLIBRARY_NAME = libpcre.la
LTLIBRARY_SOURCES = maketables.c get.c study.c pcre.c pcreposix.c
-CLEANFILES = dftables chartables.c
-DISTCLEANFILES = config.h $(CLEANFILES)
+CLEAN_TARGETS = dftables chartables.c
+DISTCLEAN_TARGETS = pcre.h pcre-config config.h $(CLEAN_TARGETS)
include $(top_srcdir)/build/ltlib.mk
1.10 +1 -0 httpd-2.0/support/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 2000/12/27 23:30:37 1.9
+++ Makefile.in 2001/01/06 21:47:49 1.10
@@ -1,3 +1,4 @@
+DISTCLEAN_TARGETS = apxs apachectl
PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
targets = $(PROGRAMS)