From: Garrett C. <yab...@us...> - 2009-12-06 21:36:04
|
Update of /cvsroot/ltp/ltp/include/mk In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4891/include/mk Modified Files: automake.mk Log Message: 1. Make the autotools process more straightforward. 2. Fix a corner case where executing distclean after autotools was failing to find testcases/realtime/include/realtime_config.h.in. Signed-off-by: Garrett Cooper <yan...@gm...> Index: automake.mk =================================================================== RCS file: /cvsroot/ltp/ltp/include/mk/automake.mk,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** automake.mk 5 Dec 2009 06:53:43 -0000 1.9 --- automake.mk 6 Dec 2009 21:35:55 -0000 1.10 *************** *** 31,34 **** --- 31,37 ---- testcases/realtime + # We want to run this every single time to ensure that all of the prereq files + # are there. + .PHONY: testcases/realtime/configure testcases/realtime/configure: $(MAKE) -C $(@D) autotools *************** *** 50,62 **** .PHONY: autoheader ! autoheader: include/config.h.in include: mkdir -p "$@" - include/config.h.in: configure.ac $(wildcard m4/*.m4) m4/ltp-version.m4 aclocal.m4 - $(AUTOHEADER) - touch $@ - m4/ltp-version.m4: ChangeLog sed -n '1{s:LTP-:AC_DEFUN([LTP_VERSION],[:;s:$$:]):;p;q}' $< > $@ --- 53,62 ---- .PHONY: autoheader ! autoheader: configure.ac $(wildcard m4/*.m4) m4/ltp-version.m4 aclocal.m4 ! $(AUTOHEADER) include: mkdir -p "$@" m4/ltp-version.m4: ChangeLog sed -n '1{s:LTP-:AC_DEFUN([LTP_VERSION],[:;s:$$:]):;p;q}' $< > $@ *************** *** 73,79 **** $(RM) -rf autom4te.cache $(RM) -f aclocal.m4 config.log config.status ! $(RM) -f include/config.h include/config.h.in include/stamp-h1 $(RM) -f m4/Makefile m4/ltp-version.m4 ! -for d in $(AUTOCONFED_SUBDIRS); do \ $(MAKE) -C "$(top_srcdir)/$$d" $@; \ done --- 73,79 ---- $(RM) -rf autom4te.cache $(RM) -f aclocal.m4 config.log config.status ! $(RM) -f include/config.h include/stamp-h1 $(RM) -f m4/Makefile m4/ltp-version.m4 ! for d in $(AUTOCONFED_SUBDIRS); do \ $(MAKE) -C "$(top_srcdir)/$$d" $@; \ done *************** *** 81,92 **** ac-distclean:: ac-clean ac-maintainer-clean:: ac-distclean ! -for d in $(AUTOCONFED_SUBDIRS); do \ $(MAKE) -C "$(top_srcdir)/$$d" $@; \ done $(RM) -f aclocal.m4 configure $(AUTOMAKE_FILES) m4/Makefile.in ! ! AUTOCONFED_SUBDIRS = \ ! testcases/kernel/syscalls/pcllib \ ! testcases/realtime # Don't include config.h, or make will (rightfully) whine about overriding --- 81,89 ---- ac-distclean:: ac-clean ac-maintainer-clean:: ac-distclean ! for d in $(AUTOCONFED_SUBDIRS); do \ $(MAKE) -C "$(top_srcdir)/$$d" $@; \ done $(RM) -f aclocal.m4 configure $(AUTOMAKE_FILES) m4/Makefile.in ! $(RM) -f include/*config.h.in # Don't include config.h, or make will (rightfully) whine about overriding *************** *** 104,108 **** distclean:: %: clean ac-distclean ! -for d in $(AUTOCONFED_SUBDIRS); do \ $(MAKE) -C "$(top_srcdir)/$$d" $@; \ done --- 101,105 ---- distclean:: %: clean ac-distclean ! for d in $(AUTOCONFED_SUBDIRS); do \ $(MAKE) -C "$(top_srcdir)/$$d" $@; \ done *************** *** 114,118 **** $(SHELL) $^ ! $(top_builddir)/config.status: $(MAKE) -C $(top_srcdir) help; \ exit 1 --- 111,117 ---- $(SHELL) $^ ! $(top_builddir)/include/config.h: include/config.h.in ! ! $(top_builddir)/config.status include/config.h.in: $(MAKE) -C $(top_srcdir) help; \ exit 1 |