|
Lines 1-5
Link Here
|
| 1 |
--- makefile.orig Sun Sep 21 02:19:30 2003 |
1 |
--- makefile.orig Sun Sep 21 11:19:30 2003 |
| 2 |
+++ makefile Mon Oct 6 18:02:43 2003 |
2 |
+++ makefile Tue Oct 7 10:52:28 2003 |
| 3 |
@@ -8,8 +8,8 @@ |
3 |
@@ -8,8 +8,8 @@ |
| 4 |
# To force GTK+ 1 build, define GTK1 on the make command line. |
4 |
# To force GTK+ 1 build, define GTK1 on the make command line. |
| 5 |
|
5 |
|
|
Lines 21-27
Link Here
|
| 21 |
|
21 |
|
| 22 |
vpath %.h ../src ../include |
22 |
vpath %.h ../src ../include |
| 23 |
vpath %.cxx ../src |
23 |
vpath %.cxx ../src |
| 24 |
@@ -33,29 +34,33 @@ |
24 |
@@ -33,29 +34,29 @@ |
| 25 |
endif |
25 |
endif |
| 26 |
|
26 |
|
| 27 |
ifdef DEBUG |
27 |
ifdef DEBUG |
|
Lines 35-54
Link Here
|
| 35 |
# If explicit setting of GTK1 or GTK2 then use that else look for |
35 |
# If explicit setting of GTK1 or GTK2 then use that else look for |
| 36 |
# pkg-config which is an OK indication that GTK2 is available |
36 |
# pkg-config which is an OK indication that GTK2 is available |
| 37 |
ifdef GTK2 |
37 |
ifdef GTK2 |
| 38 |
CONFIGFLAGS=pkg-config --cflags gtk+-2.0 |
38 |
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0 |
| 39 |
+MORELIBS=pkg-config --libs gthread-2.0 |
39 |
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0 |
| 40 |
else |
40 |
else |
| 41 |
ifdef GTK1 |
41 |
ifdef GTK1 |
| 42 |
-CONFIGFLAGS=gtk-config --cflags |
42 |
-CONFIGFLAGS=gtk-config --cflags |
| 43 |
+CONFIGFLAGS=pkg-config --cflags gtk+ |
43 |
+CONFIGFLAGS=pkg-config --cflags gtk+ gthread |
| 44 |
+MORELIBS=pkg-config --libs gthread |
|
|
| 45 |
else |
44 |
else |
| 46 |
ifneq (,$(findstring /,$(shell whereis -b pkg-config))) |
45 |
ifneq (,$(findstring /,$(shell whereis -b pkg-config))) |
| 47 |
CONFIGFLAGS=pkg-config --cflags gtk+-2.0 |
46 |
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0 |
| 48 |
+MORELIBS=pkg-config --libs gthread-2.0 |
47 |
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0 |
| 49 |
else |
48 |
else |
| 50 |
CONFIGFLAGS=gtk-config --cflags |
49 |
-CONFIGFLAGS=gtk-config --cflags |
| 51 |
+MORELIBS=pkg-config --libs gthread |
50 |
+CONFIGFLAGS=gtk-config --cflags gthread |
| 52 |
endif |
51 |
endif |
| 53 |
endif |
52 |
endif |
| 54 |
endif |
53 |
endif |
|
Lines 59-65
Link Here
|
| 59 |
|
58 |
|
| 60 |
#++Autogenerated -- run src/LexGen.py to regenerate |
59 |
#++Autogenerated -- run src/LexGen.py to regenerate |
| 61 |
#**LEXOBJS=\\\n\(\*.o \) |
60 |
#**LEXOBJS=\\\n\(\*.o \) |
| 62 |
@@ -69,7 +74,7 @@ |
61 |
@@ -69,7 +70,7 @@ |
| 63 |
|
62 |
|
| 64 |
# The LEXOBJS have to be treated specially as the functions in them are not called from external code |
63 |
# The LEXOBJS have to be treated specially as the functions in them are not called from external code |
| 65 |
|
64 |
|
|
Lines 68-83
Link Here
|
| 68 |
|
67 |
|
| 69 |
clean: |
68 |
clean: |
| 70 |
rm -f *.o $(COMPLIB) |
69 |
rm -f *.o $(COMPLIB) |
| 71 |
@@ -81,8 +86,10 @@ |
70 |
@@ -81,8 +82,10 @@ |
| 72 |
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ |
71 |
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ |
| 73 |
KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ |
72 |
KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ |
| 74 |
RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o |
73 |
RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o |
| 75 |
- $(AR) rc $@ $^ |
74 |
- $(AR) rc $@ $^ |
| 76 |
- $(RANLIB) $@ |
75 |
- $(RANLIB) $@ |
| 77 |
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` `${MORELIBS}` -o $@ $^ |
76 |
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ |
| 78 |
+ |
77 |
+ |
| 79 |
+ $(LEXRLIB): $(LEXOBJS) |
78 |
+ $(LEXRLIB): $(LEXOBJS) |
| 80 |
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` `${MORELIBS}` -o $@ $^ |
79 |
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ |
| 81 |
|
80 |
|
| 82 |
# Automatically generate header dependencies with "make deps" |
81 |
# Automatically generate header dependencies with "make deps" |
| 83 |
include deps.mak |
82 |
include deps.mak |