From 97fe53445d22063d572a75df08f69d99ed671502 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 25 Aug 2004 11:42:11 +0000
Subject: [PATCH] Makefiles generated by configure

---
 Makefile     | 13 +++++++++++--
 src/Makefile |  6 +++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 0cc1ccc..35ba354 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,14 @@
 SUBDIRS	= src
 
 
-all clean distclean:
-	@for i in $(SUBDIRS); do make -C $$i $@ || exit $$?; done
+all: subdirs
+
+subdirs:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
+
+
+clean:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
+
+distclean: clean
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
diff --git a/src/Makefile b/src/Makefile
index 4f7a48d..ccf9d58 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-TARGETS	= libGToolkit
+TARGETS	= libGToolkit.a libGToolkit.so
 CFLAGSF	= -W -Wall -ansi
 CFLAGS	= -g
 CC	= cc
@@ -11,7 +11,7 @@ RM	= rm -f
 all: $(TARGETS)
 
 libGToolkit_OBJS= gtoolkit.o
-libGToolkit: libGToolkit.a libGToolkit.so
+libGToolkit_CFLAGS=$(CFLAGSF) $(CFLAGS)
 libGToolkit.a: $(libGToolkit_OBJS)
 	$(AR) libGToolkit.a $(libGToolkit_OBJS)
 	$(RANLIB) libGToolkit.a
@@ -20,7 +20,7 @@ libGToolkit.so: $(libGToolkit_OBJS)
 	$(LD) -o libGToolkit.so $(libGToolkit_OBJS)
 
 gtoolkit.o: gtoolkit.c
-	$(CC) $(CFLAGSF) $(CFLAGS) -c gtoolkit.c
+	$(CC) $(libGToolkit_CFLAGS) -c gtoolkit.c
 
 
 clean: