summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-08-28 18:52:10 +0000
committerJean Delvare <khali@linux-fr.org>2005-08-28 18:52:10 +0000
commitc8a84309dd30f0d62d22df06a13320f7cac66c4f (patch)
tree989aed461e31bd411d80e0fcbc77535b95d99b10
parent0d5431ab7ea78ebff3d8fafc51594dc5502c1514 (diff)
downloadquilt-c8a84309dd30f0d62d22df06a13320f7cac66c4f.tar.gz
- configure.ac, Makefile.in: Support GCC and other compilers. Allow
executable extensions (non-Unix.) Original patch from John Vandenberg.
-rw-r--r--Makefile.in14
-rw-r--r--configure.ac8
-rw-r--r--quilt.changes6
3 files changed, 24 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 92b8f67..3afa156 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,12 @@ else
MAKE_NLS := $(MAKE)
endif
-CFLAGS := @CFLAGS@ -Wall
+CC := @CC@
+CPPFLAGS += @CPPFLAGS@
+CFLAGS += @CFLAGS@
+LDFLAGS += @LDFLAGS@
+LIBS := @LIBS@
+EXEEXT := @EXEEXT@
ISODATE := $(shell date +%Y-%m-%d)
@@ -70,9 +75,9 @@ SRC += $(SCRIPTS_SRC:%=scripts/%)
DIRT += $(SCRIPTS_IN:%=scripts/%)
LIB_SRC := backup-files.c
-LIB := backup-files
+LIB := backup-files$(EXEEXT)
SRC += $(LIB_SRC:%=lib/%)
-DIRT += lib/backup-files lib/backup-files.o
+DIRT += lib/backup-files$(EXEEXT) $(LIB_SRC:%.c=lib/%.o)
DOC_IN := README
DOC_SRC := $(DOC_IN:%=doc/%.in)
@@ -105,6 +110,9 @@ all : scripts
$(MAKE_NLS) -C po all BUILD_ROOT=$(BUILD_ROOT) \
LINGUAS="$(LINGUAS)" localedir=$(localedir)
+$(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o)
+ $(CC) -o $@ $(LDFLAGS) $^ $(LIBS)
+
scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) $(SCRIPTS:%=scripts/%) \
$(LIB:%=lib/%) $(DOC:%=doc/%) $(MAN1)
diff --git a/configure.ac b/configure.ac
index 3e146d0..3f2acd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org])
AC_CONFIG_AUX_DIR(config)
AC_PREREQ(2.53)
-AC_REVISION ($Revision: 1.39 $)
+AC_REVISION ($Revision: 1.40 $)
PACKAGE_RELEASE=1
AC_SUBST(PACKAGE_RELEASE)
@@ -17,6 +17,12 @@ AC_CHECK_FUNCS([strrchr])
AC_C_CONST
AC_FUNC_STAT
+if test "$ac_compiler_gnu" = "yes"; then
+ CFLAGS="$CFLAGS -Wall"
+fi
+EXEEXT="$ac_cv_exeext"
+AC_SUBST(EXEEXT)
+
AC_PROG_INSTALL
AC_SYS_INTERPRETER
diff --git a/quilt.changes b/quilt.changes
index a078020..4f80dd5 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,9 @@
+Sun Aug 28 20:48:12 CEST 2005 - khali@linux-fr.org
+
+- configure.ac, Makefile.in: Support GCC and other compilers.
+ Allow executable extensions (non-Unix.) Original patch from
+ John Vandenberg.
+
-------------------------------------------------------------------
Fri Aug 26 13:03:19 CEST 2005 - khali@linux-fr.org