Improving the chances for the project to compile

Makefile

@@ -1,6 +1,6 @@
 PACKAGE	= GToolkit
 VERSION	= 0.0.0
-SUBDIRS	= src
+SUBDIRS	= src tools
 RM	= rm -f
 LN	= ln -f
 TAR	= tar -czvf
@@ -24,7 +24,11 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/common.c \
 		$(PACKAGE)-$(VERSION)/src/gwindow.c \
 		$(PACKAGE)-$(VERSION)/src/gtoolkit.c \
+		$(PACKAGE)-$(VERSION)/src/Makefile \
 		$(PACKAGE)-$(VERSION)/src/project.conf \
+		$(PACKAGE)-$(VERSION)/tools/test.c \
+		$(PACKAGE)-$(VERSION)/tools/Makefile \
+		$(PACKAGE)-$(VERSION)/tools/project.conf \
 		$(PACKAGE)-$(VERSION)/Makefile \
 		$(PACKAGE)-$(VERSION)/project.conf
 	$(RM) -- $(PACKAGE)-$(VERSION)

project.conf

@@ -1,5 +1,5 @@
 package=GToolkit
 version=0.0.0
 
-subdirs=src
+subdirs=src,tools
 dist=Makefile

src/Makefile

@@ -3,9 +3,9 @@ PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
 CC	= cc
-CPPFLAGSF=
+CPPFLAGSF= -I ../include
 CPPFLAGS=
-CFLAGSF	= -W -I ../include
+CFLAGSF	= -W `pkg-config --cflags gl`
 CFLAGS	= -Wall -fPIC -g -O2 -pedantic
 AR	= ar -rc
 RANLIB	= ranlib
@@ -20,14 +20,14 @@ all: $(TARGETS)
 
 libGToolkit_OBJS = common.o gwindow.o gtoolkit.o
 libGToolkit_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-libGToolkit_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+libGToolkit_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gl`
 
 libGToolkit.a: $(libGToolkit_OBJS)
 	$(AR) libGToolkit.a $(libGToolkit_OBJS)
 	$(RANLIB) libGToolkit.a
 
 libGToolkit.so: $(libGToolkit_OBJS)
-	$(LD) -o libGToolkit.so -Wl,-soname,libGToolkit.so.0 $(libGToolkit_OBJS)
+	$(LD) -o libGToolkit.so -Wl,-soname,libGToolkit.so.0 $(libGToolkit_OBJS) `pkg-config --libs gl`
 
 common.o: common.c
 	$(CC) $(libGToolkit_CFLAGS) -c common.c

src/common.c

@@ -1,4 +1,4 @@
-/* common.c */
+/* $Id$ */
 
 
 
@@ -29,6 +29,7 @@ void * g_alloc(size_t size)
 }
 
 
+/* g_alloced */
 void * g_alloced(void * ptr)
 {
 	size_t i;
@@ -40,6 +41,7 @@ void * g_alloced(void * ptr)
 }
 
 
+/* g_free */
 void g_free(void * ptr)
 {
 	size_t i;

src/common.h

@@ -1,4 +1,4 @@
-/* common.h */
+/* $Id$ */
 
 
 

src/gtoolkit.c

@@ -1,4 +1,4 @@
-/* gtoolkit.c */
+/* $Id$ */
 
 
 

src/gwidget.h

@@ -1 +1,14 @@
+/* $Id$ */
+
+
+
+#ifndef GTOOLKIT_GWIDGET_H
+# define GTOOLKIT_GWIDGET_H
+
+
+/* GWidget */
+/* public */
+/* types */
 GWidget * widget;
+
+#endif /* !GTOOLKIT_GWIDGET_H */

src/gwindow.c

@@ -1,4 +1,4 @@
-/* gwindow.c */
+/* $Id$ */
 
 
 

src/project.conf

@@ -1,16 +1,10 @@
-#targets=libGToolkit,test
 targets=libGToolkit
-cflags_force=-W -I ../include
+cppflags_force=-I ../include
+cflags_force=-W `pkg-config --cflags gl`
 cflags=-Wall -fPIC -g -O2 -pedantic
+dist=Makefile
 
 [libGToolkit]
 type=library
 sources=common.c,gwindow.c,gtoolkit.c
-
-[test]
-type=binary
-sources=test.c
-ldflags=-L . -l GToolkit -l X11 -l GL
-
-[test.c]
-depends=../include/GToolkit.h
+ldflags=`pkg-config --libs gl`

tools/Makefile

@@ -0,0 +1,38 @@
+TARGETS	= test
+PREFIX	= /usr/local
+DESTDIR	= 
+BINDIR	= $(PREFIX)/bin
+CC	= cc
+CPPFLAGSF= -I ../include
+CPPFLAGS=
+CFLAGSF	= -W
+CFLAGS	= -Wall -fPIC -g -O2 -pedantic
+RM	= rm -f
+LN	= ln -f
+MKDIR	= mkdir -p
+INSTALL	= install
+
+
+all: $(TARGETS)
+
+test_OBJS = test.o
+test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L../src -lGToolkit
+
+test: $(test_OBJS)
+	$(CC) -o test $(test_OBJS) $(test_LDFLAGS)
+
+test.o: test.c ../include/GToolkit.h
+	$(CC) $(test_CFLAGS) -c test.c
+
+clean:
+	$(RM) -- $(test_OBJS)
+
+distclean: clean
+	$(RM) -- $(TARGETS)
+
+install: all
+
+uninstall:
+
+.PHONY: all clean distclean install uninstall

tools/project.conf

@@ -0,0 +1,13 @@
+targets=test
+cppflags_force=-I ../include
+cflags_force=-W
+cflags=-Wall -fPIC -g -O2 -pedantic
+dist=Makefile
+
+[test]
+type=binary
+sources=test.c
+ldflags=-L../src -lGToolkit
+
+[test.c]
+depends=../include/GToolkit.h

tools/test.c

@@ -1,3 +1,7 @@
+/* $Id$ */
+
+
+
 #include <GToolkit.h>