From d454c2682afbfd3e1aa98fd1be585edacd80b3c7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 26 Oct 2009 22:35:57 -0400 Subject: add .gitignore clean up Makefile a bit add comments on `bashisms' in configure Add a `make commit' bit. Won't really be usefull to others, but is way more convenient for me than make distclean git add -A git commit -a --- .gitignore | 5 +++++ Makefile | 19 ++++++++++--------- configure | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..13fe430 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*/configure +*/COPYING +*/Makefile.in +*-build + diff --git a/Makefile b/Makefile index 71a3942..260b95f 100644 --- a/Makefile +++ b/Makefile @@ -30,16 +30,20 @@ mods = $(filter-out %-build,\ .PHONY : all all : +.PHONY : commit +commit : distclean + git add -A + git commit -a + .SECONDARY: %/COPYING : COPYING %/; cp $< $@ %/configure : configure %/; cp $< $@ %/Makefile.in : Makefile.in %/; cp $< $@ -clean-mods = $(addprefix clean-,$(mods)) -distclean-mods = $(addprefix distclean-,$(mods)) +distclean-mods = $(addprefix distclean-,$(mods)) -.PHONY : distclean +.PHONY : distclean $(distclean-mods) distclean : $(distclean-mods) distclean-% : % %/ $(RM) -r $<-build/ @@ -57,10 +61,7 @@ complete-% : %/ cd $<; ../$(patsubst %-build,%/,$<)/configure $(MAKE) -C $< Makefiles -build-% : %-build complete-% %-build/Makefile - $(MAKE) -C $< -install-% : %-build build-% - $(MAKE) -C $< install -clean-% : %-build - $(MAKE) -C $< clean +build-% : %-build complete-% %-build/Makefile; $(MAKE) -C $< +install-% : %-build; $(MAKE) -C $< install +clean-% : %-build; $(MAKE) -C $< clean diff --git a/configure b/configure index 11da35b..4856815 100755 --- a/configure +++ b/configure @@ -78,8 +78,8 @@ done Makefiles="`find "${_srcdir}/" -type f -name Makefile.in`" Makefiles="$Makefiles `find "${_srcdir}/" -type f -name *.mk.in`" for orig in $Makefiles; do - new=${orig/%.in/} - new=${new/#$_srcdir\//} + new=${orig/%.in/} #bashism + new=${new/#$_srcdir\//} #bashism mkdir -p `dirname "$new"` sed -f var.sed "${orig}" | sed \ -e '19 a# DO NOT edit this file, it has been generated by configure, and will' \ -- cgit v1.2.3-2-g168b