diff options
| author | nyamatongwe <unknown> | 2007-05-15 00:11:31 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2007-05-15 00:11:31 +0000 |
| commit | a645e3f3d7a8c1a52523a1ea9f28c3db823cb865 (patch) | |
| tree | f38f6322ac3d881aab656c5bc0bc3f108f77ce2a | |
| parent | 44334ce3fd1554d24a09b609e50d598b72a1e10e (diff) | |
| download | scintilla-mirror-a645e3f3d7a8c1a52523a1ea9f28c3db823cb865.tar.gz | |
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.
| -rw-r--r-- | gtk/makefile | 14 |
1 files changed, 7 insertions, 7 deletions
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 \ |