From fa83ffb952e0ebc1fcbb0226784016dcb27e9a41 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Tue, 15 May 2007 00:11:31 +0000
Subject: Applied part of a patch from S. Sevki Dincer that changed
 determination of GTK+ flags and libararies so that it only occurred once
 rather than for every compile.

---
 gtk/makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'gtk')

diff --git a/gtk/makefile b/gtk/makefile
index 4dc78a54a..eb7dec885 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -40,25 +40,25 @@ endif
 # If explicit setting of GTK1 or GTK2 then use that else look for
 # pkg-config which is an OK indication that GTK2 is available
 ifdef GTK2
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
 MARSHALLER=scintilla-marshal.o
 else
 ifdef GTK1
-CONFIGFLAGS=gtk-config --cflags
+CONFIGFLAGS=$(shell gtk-config --cflags)
 else
 ifneq (,$(findstring /,$(shell whereis pkg-config)))
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
 MARSHALLER=scintilla-marshal.o
 else
-CONFIGFLAGS=gtk-config --cflags
+CONFIGFLAGS=$(shell gtk-config --cflags)
 endif
 endif
 endif
 
 .cxx.o:
-	$(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
+	$(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
 .c.o:
-	$(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
+	$(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
 
 #++Autogenerated -- run src/LexGen.py to regenerate
 #**LEXOBJS=\\\n\(\*.o \)
@@ -80,7 +80,7 @@ clean:
 	rm -f *.o $(COMPLIB)
 
 deps:
-	$(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
+	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
 
 $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
 	CharClassify.o Decoration.o Document.o CallTip.o \
-- 
cgit v1.2.3