[Extractor-gtk-cvslog] SF.net SVN: extractor-gtk:[98] trunk/extractor/Makefile

[<som...@us...>]

Revision: 98
          http://extractor-gtk.svn.sourceforge.net/extractor-gtk/?rev=98&view=rev
Author:   someone-guy
Date:     2008-08-22 16:09:05 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
Cleanup compiler flags handling in Makefile

Modified Paths:
--------------
    trunk/extractor/Makefile

Modified: trunk/extractor/Makefile
===================================================================
--- trunk/extractor/Makefile	2008-08-22 16:08:44 UTC (rev 97)
+++ trunk/extractor/Makefile	2008-08-22 16:09:05 UTC (rev 98)
@@ -16,12 +16,14 @@
     helpers.c \
 
 ifeq ($(WITHOUT_GTK), yes)
-GTKFLAGS=-DWITHOUT_GTK
+CFLAGS+=-DWITHOUT_GTK
 else
 MAIN+= gtkstuff.c
-GTKFLAGS=`pkg-config --cflags --libs gtk+-2.0`
-#GTKFLAGS=-mms-bitfields -Iinclude libglib-2.0-0.dll libgobject-2.0-0.dll libgdk-win32-2.0-0.dll libgdk_pixbuf-2.0-0.dll libgtk-win32-2.0-0.dll intl.dll
-#GTKFLAGS+=-mwindows
+CFLAGS+=$(shell pkg-config --cflags gtk+-2.0)
+LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
+#CFLAGS+=-mms-bitfields -Iinclude
+#LDFLAGS=libglib-2.0-0.dll libgobject-2.0-0.dll libgdk-win32-2.0-0.dll libgdk_pixbuf-2.0-0.dll libgtk-win32-2.0-0.dll intl.dll
+#LDFLAGS+=-mwindows
 endif
 
 SRCS=$(MAIN) $(MODULES)
@@ -33,13 +35,13 @@
 depend: $(DEPS)
 
 %.d: %.c
-	$(CC) -MM $(CFLAGS) $(GTKFLAGS) $< -o $@
+	$(CC) -MM $(CFLAGS) $< -o $@
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) $(GTKFLAGS) $< -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
 
 extractor: $(OBJS)
-	$(CC) $(CFLAGS) $(GTKFLAGS) $^ -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
 clean:
 	rm -f extractor *.o *.d


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.