I found a few more little problems in the Makefile. It seems things are working now, so I merged the whole stuff.
-- Andreas.
- Remove compat/compatfns when no compatibility functions are included. Clean up some Makefile dependencies. Members: Makefile.in:1.74->1.75 quilt.changes:1.273->1.274 Index: quilt/Makefile.in diff -u quilt/Makefile.in:1.74 quilt/Makefile.in:1.75 --- quilt/Makefile.in:1.74 Sat Sep 17 23:57:48 2005 +++ quilt/Makefile.in Sun Sep 18 00:01:48 2005 @@ -90,11 +90,13 @@ 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 @@ $(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 @@ 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 \ Index: quilt/quilt.changes diff -u quilt/quilt.changes:1.273 quilt/quilt.changes:1.274 --- quilt/quilt.changes:1.273 Sat Sep 17 23:58:48 2005 +++ quilt/quilt.changes Sun Sep 18 00:01:48 2005 @@ -1,10 +1,12 @@ ------------------------------------------------------------------- -Sun Sep 18 01:59:10 CEST 2005 - [EMAIL PROTECTED] +Sun Sep 18 02:00:50 CEST 2005 - [EMAIL PROTECTED] - Merge compatibility layer from John Vandenberg <[EMAIL PROTECTED]>. - 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 - [EMAIL PROTECTED]
_______________________________________________ Quilt-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/quilt-dev
