Commit e172e3f5 authored by Roy T. Fielding's avatar Roy T. Fielding
Browse files

Make clean, distclean, and extraclean consistently according to the 

Gnu makefile guidelines.

Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:  Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88809 13f79535-47bb-0310-9956-ffa450edef68
parent 57bcc0a8

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.17-dev



  *) Make clean, distclean, and extraclean consistently according to the

     Gnu makefile guidelines.  [Justin Erenkrantz <jerenkrantz@ebuilt.com>]



  *) Fix errors in the renaming of the apr_threadattr_detach_xxx functions.

     This may have been causing problems stopping processes in the threaded

     mpm's. [Greg Ames]

Makefile.in

+4 −4
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ targets = $(PROGRAMS) $(other_targets) 
phony_targets   = $(srcdir)/buildmark.c

install_targets = install-conf install-htdocs install-icons install-other \

	install-cgi install-include install-support install-suexec

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 \

	missing mkinstalldirs

DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \

	modules.c libtool

EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in \

	generated_lists



include $(top_srcdir)/build/rules.mk

include $(top_srcdir)/build/program.mk

build/rules.mk

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ distclean: distclean-recursive clean-x 
	rm -f config.cache config.log config.status config_vars.mk \

	stamp-h Makefile shlibtool .deps $(DISTCLEAN_TARGETS)



extraclean: distclean

	rm -f $(EXTRACLEAN_TARGETS)



include $(builddir)/.deps



.PHONY: all-recursive clean-recursive install-recursive \

server/Makefile.in

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
TARGET_EXPORTS    = apache.exports

CLEAN_TARGETS = gen_test_char gen_uri_delims test_char.h uri_delims.h \

	$(TARGET_EXPORTS) ApacheCoreOS2.def

EXTRACLEAN_TARGETS = exports.c



SUBDIRS = mpm

support/Makefile.in

+2 −1
Original line number Diff line number Diff line 
DISTCLEAN_TARGETS = apxs apachectl

DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status logresolve.pl \

	phf_abuse_log.cgi split-logfile



PROGRAMS = htpasswd htdigest rotatelogs logresolve ab

targets  = $(PROGRAMS)