diff options
| -rw-r--r-- | Makefile.in | 16 | ||||
| -rw-r--r-- | quilt.changes | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 63bfdef..4e286b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,11 +90,13 @@ DIRT += $(QUILT_IN:%=quilt/%) SCRIPTS_IN := patchfns parse-patch inspect dependency-graph edmail \ remove-trailing-ws -COMPAT := $(COMPAT_PROGRAMS:%=compat/%) $(COMPAT_FUNCTIONS:%=compat/%) SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) SCRIPTS := $(SCRIPTS_IN) -SRC += $(SCRIPTS_SRC:%=scripts/%) $(COMPAT_PROGRAMS:%=compat/%.in) -DIRT += $(SCRIPTS_IN:%=scripts/%) $(COMPAT) compat/compatfns +SRC += $(SCRIPTS_SRC:%=scripts/%) +DIRT += $(SCRIPTS_IN:%=scripts/%) + +SRC += $(wildcard compat/*.in) $(wildcard compat/*.sh) +DIRT += $(patsubst %.in,%,$(wildcard compat/*.in)) compat/compatfns LIB_SRC := backup-files.c LIB := backup-files$(EXEEXT) @@ -134,9 +136,11 @@ all : scripts $(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o) $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) -compat : $(COMPAT) +.PHONY :: compat +compat : + @rm -f compat/compatfns ifneq ($(COMPAT_FUNCTIONS),) - cat $(COMPAT_FUNCTIONS:%=compat/%) > compat/compatfns + cat $(COMPAT_FUNCTIONS:%=compat/%.sh) > compat/compatfns endif scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) $(SCRIPTS:%=scripts/%) compat \ @@ -162,7 +166,7 @@ doc/README : doc/README.in $(QUILT:%=quilt/%) esac ; \ done 2>&1 < $< > $@ -doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) $(COMPAT) +doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) @echo "quilt.1.in -> quilt.1" @here=`pwd`; \ while read line; do \ diff --git a/quilt.changes b/quilt.changes index f611436..22afdaf 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,10 +1,12 @@ ------------------------------------------------------------------- -Sun Sep 18 01:59:10 CEST 2005 - agruen@suse.de +Sun Sep 18 02:00:50 CEST 2005 - agruen@suse.de - Merge compatibility layer from John Vandenberg <jayvdb@gmail.com>. - Only add compat/ directory to PATH if it exists. Only create it when necessary. - configure.ac: fail if getopt does not support --long. +- Remove compat/compatfns when no compatibility functions are + included. Clean up some Makefile dependencies. ------------------------------------------------------------------- Fri Sep 16 20:57:32 CEST 2005 - khali@linux-fr.org |