[Antiright-devel] antiright configure gtkshell/Makefile

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/05/21 13:38:58

Modified files:
        .              : configure 
        gtkshell       : Makefile 

Log message:
        Call pkg-config in configure script to generate INCLUDES, so that it 
will
        not have to be called for each source file.  Should reduce build time.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.32&r2=1.33

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- configure   20 May 2007 22:45:16 -0000      1.99
+++ configure   21 May 2007 13:38:58 -0000      1.100
@@ -97,6 +97,7 @@
        echo found
        DEFS="$DEFS -DHAVE_VTE"
        echo 'VTE=1' >> config.mk
+       INCLUDE="$INCLUDE $(pkg-config --cflags vte)"
 else
        echo not found
 fi
@@ -110,6 +111,7 @@
 else
        echo not found
 fi
+INCLUDE="$INCLUDE $(pkg-config --cflags gtk+-2.0)"
 INCLUDE="$INCLUDE -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include"
 LIBDIR="$LIBDIR -L/usr/pkg/lib -L/usr/local/lib -L/usr/X11R6/lib"
 

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gtkshell/Makefile   20 May 2007 18:29:57 -0000      1.32
+++ gtkshell/Makefile   21 May 2007 13:38:58 -0000      1.33
@@ -26,20 +26,21 @@
 include ../config.mk
 
 #CFLAGS+=`pkg-config --cflags gtk+-2.0` -g3 -Wall -W -Werror
-GTKFLAGS=`pkg-config --cflags gtk+-2.0` 
-CFLAGS+=$(GTKFLAGS) $(DEFS)
+#GTKFLAGS=`pkg-config --cflags gtk+-2.0` 
+#CFLAGS+=$(GTKFLAGS) $(DEFS)
+CFLAGS+=$(DEFS) $(INCLUDE)
 LDFLAGS+=-L../libantiright -lantiright
 LDFLAGS+=`pkg-config --libs gtk+-2.0`
 
-.if defined(VTE)
+ifdef VTE
 CFLAGS+=-DHAVE_VTE
-GTKFLAGS+=`pkg-config --cflags vte`
+#GTKFLAGS+=`pkg-config --cflags vte`
 LDFLAGS+=`pkg-config --libs vte`
-.endif
+endif
 
-.if defined(LIBGC)
+ifdef LIBGC
 LDFLAGS+=-lgc
-.endif
+endif
 
 #LDFLAGS+=-lefence