Commit 9ffdba13 authored by dgaudet's avatar dgaudet
Browse files

- 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87597 13f79535-47bb-0310-9956-ffa450edef68
parent 76fbecd3

Makefile.in

+3 −2
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ targets = $(PROGRAMS) 
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

acinclude.m4

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[ 
])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

build/build2.mk

+3 −1
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4 


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

build/rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -182,12 +182,12 @@ depend: depend-recursive 
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

server/Makefile.in

+1 −1
Original line number Diff line number Diff line 


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