From 1f0a0f014d77a152042c7f43fc56bf47f6dc1394 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 12 Dec 2009 12:13:29 +0000
Subject: [PATCH] Re-generated Makefiles and compiling with -pedantic

---
 Makefile         |  5 ++---
 src/Makefile     | 16 +++++++---------
 src/project.conf |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 559dc52..e28fc39 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PACKAGE	= GToolkit
 VERSION	= 0.0.0
 SUBDIRS	= src
 RM	= rm -f
-LN	= ln -sf
+LN	= ln -f
 TAR	= tar -czvf
 
 
@@ -19,12 +19,11 @@ distclean:
 
 dist:
 	$(RM) -r $(PACKAGE)-$(VERSION)
-	$(LN) . $(PACKAGE)-$(VERSION)
+	$(LN) -s . $(PACKAGE)-$(VERSION)
 	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
 		$(PACKAGE)-$(VERSION)/src/common.c \
 		$(PACKAGE)-$(VERSION)/src/gwindow.c \
 		$(PACKAGE)-$(VERSION)/src/gtoolkit.c \
-		$(PACKAGE)-$(VERSION)/src/test.c \
 		$(PACKAGE)-$(VERSION)/src/project.conf \
 		$(PACKAGE)-$(VERSION)/Makefile \
 		$(PACKAGE)-$(VERSION)/project.conf
diff --git a/src/Makefile b/src/Makefile
index 70e8bc4..44e2fe3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,13 +3,15 @@ PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
 CC	= cc
+CPPFLAGSF=
 CPPFLAGS=
 CFLAGSF	= -W -I ../include
-CFLAGS	= -Wall -fPIC -g -O2 -ansi
+CFLAGS	= -Wall -fPIC -g -O2 -pedantic
 AR	= ar -rc
 RANLIB	= ranlib
-LD	= ld -shared
+LD	= $(CC) -shared
 RM	= rm -f
+LN	= ln -f
 MKDIR	= mkdir -p
 INSTALL	= install
 
@@ -17,14 +19,15 @@ INSTALL	= install
 all: $(TARGETS)
 
 libGToolkit_OBJS = common.o gwindow.o gtoolkit.o
-libGToolkit_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+libGToolkit_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+libGToolkit_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
 
 libGToolkit.a: $(libGToolkit_OBJS)
 	$(AR) libGToolkit.a $(libGToolkit_OBJS)
 	$(RANLIB) libGToolkit.a
 
 libGToolkit.so: $(libGToolkit_OBJS)
-	$(LD) -o libGToolkit.so $(libGToolkit_OBJS)
+	$(LD) -o libGToolkit.so -Wl,-soname,libGToolkit.so.0 $(libGToolkit_OBJS)
 
 common.o: common.c
 	$(CC) $(libGToolkit_CFLAGS) -c common.c
@@ -42,12 +45,7 @@ distclean: clean
 	$(RM) $(TARGETS)
 
 install: all
-	$(MKDIR) $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -m 0644 libGToolkit.a $(DESTDIR)$(LIBDIR)/libGToolkit.a
-	$(INSTALL) -m 0755 libGToolkit.so $(DESTDIR)$(LIBDIR)/libGToolkit.so
 
 uninstall:
-	$(RM) $(DESTDIR)$(LIBDIR)/libGToolkit.a
-	$(RM) $(DESTDIR)$(LIBDIR)/libGToolkit.so
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/project.conf b/src/project.conf
index e972fb2..9d5805f 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,7 +1,7 @@
 #targets=libGToolkit,test
 targets=libGToolkit
 cflags_force=-W -I ../include
-cflags=-Wall -fPIC -g -O2 -ansi
+cflags=-Wall -fPIC -g -O2 -pedantic
 
 [libGToolkit]
 type=library