|
Lines 1-6
Link Here
|
| 1 |
--- makefile.orig Sun Sep 21 11:19:30 2003 |
1 |
--- makefile.orig Wed Dec 24 08:45:12 2003 |
| 2 |
+++ makefile Tue Oct 7 10:52:28 2003 |
2 |
+++ makefile Sun Jan 11 19:50:44 2004 |
| 3 |
@@ -8,8 +8,8 @@ |
3 |
@@ -8,15 +8,16 @@ |
| 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 |
|
| 6 |
.SUFFIXES: .cxx .o .h .a |
6 |
.SUFFIXES: .cxx .o .h .a |
|
Lines 10-17
Link Here
|
| 10 |
+AR = $(CC) -shared |
10 |
+AR = $(CC) -shared |
| 11 |
RANLIB = touch |
11 |
RANLIB = touch |
| 12 |
|
12 |
|
| 13 |
ifeq ($(OSTYPE),darwin) |
13 |
ifeq ($(shell uname),Darwin) |
| 14 |
@@ -18,7 +18,8 @@ |
|
|
| 15 |
RANLIB = ranlib |
14 |
RANLIB = ranlib |
| 16 |
endif |
15 |
endif |
| 17 |
|
16 |
|
|
Lines 21-32
Link Here
|
| 21 |
|
20 |
|
| 22 |
vpath %.h ../src ../include |
21 |
vpath %.h ../src ../include |
| 23 |
vpath %.cxx ../src |
22 |
vpath %.cxx ../src |
| 24 |
@@ -33,29 +34,29 @@ |
23 |
@@ -31,29 +32,29 @@ |
| 25 |
endif |
24 |
endif |
| 26 |
|
25 |
|
| 27 |
ifdef DEBUG |
26 |
ifdef DEBUG |
| 28 |
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) |
27 |
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) |
| 29 |
+CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS) $(THREADFLAGS) |
28 |
+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) |
| 30 |
else |
29 |
else |
| 31 |
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) |
30 |
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) |
| 32 |
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS) |
31 |
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS) |
|
Lines 42-53
Link Here
|
| 42 |
-CONFIGFLAGS=gtk-config --cflags |
41 |
-CONFIGFLAGS=gtk-config --cflags |
| 43 |
+CONFIGFLAGS=pkg-config --cflags gtk+ gthread |
42 |
+CONFIGFLAGS=pkg-config --cflags gtk+ gthread |
| 44 |
else |
43 |
else |
| 45 |
ifneq (,$(findstring /,$(shell whereis -b pkg-config))) |
44 |
ifneq (,$(findstring /,$(shell whereis pkg-config))) |
| 46 |
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0 |
45 |
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0 |
| 47 |
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0 |
46 |
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0 |
| 48 |
else |
47 |
else |
| 49 |
-CONFIGFLAGS=gtk-config --cflags |
48 |
-CONFIGFLAGS=gtk-config --cflags |
| 50 |
+CONFIGFLAGS=gtk-config --cflags gthread |
49 |
+CONFIGFLAGS=gtk-config --cflags gtk+ gthread |
| 51 |
endif |
50 |
endif |
| 52 |
endif |
51 |
endif |
| 53 |
endif |
52 |
endif |
|
Lines 58-81
Link Here
|
| 58 |
|
57 |
|
| 59 |
#++Autogenerated -- run src/LexGen.py to regenerate |
58 |
#++Autogenerated -- run src/LexGen.py to regenerate |
| 60 |
#**LEXOBJS=\\\n\(\*.o \) |
59 |
#**LEXOBJS=\\\n\(\*.o \) |
| 61 |
@@ -69,7 +70,7 @@ |
60 |
@@ -66,7 +67,7 @@ |
|
|
61 |
LexYAML.o |
| 62 |
#--Autogenerated -- end of automatically generated section |
| 62 |
|
63 |
|
| 63 |
# The LEXOBJS have to be treated specially as the functions in them are not called from external code |
64 |
-all: $(COMPLIB) |
| 64 |
|
|
|
| 65 |
-all: $(COMPLIB) $(LEXOBJS) |
| 66 |
+all: $(COMPLIB) $(LEXRLIB) |
65 |
+all: $(COMPLIB) $(LEXRLIB) |
| 67 |
|
66 |
|
| 68 |
clean: |
67 |
clean: |
| 69 |
rm -f *.o $(COMPLIB) |
68 |
rm -f *.o $(COMPLIB) |
| 70 |
@@ -81,8 +82,10 @@ |
69 |
@@ -77,10 +78,11 @@ |
|
|
70 |
$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \ |
| 71 |
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 \ |
| 72 |
KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ |
72 |
KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ |
| 73 |
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 \ |
|
|
74 |
- $(LEXOBJS) |
| 74 |
- $(AR) rc $@ $^ |
75 |
- $(AR) rc $@ $^ |
| 75 |
- $(RANLIB) $@ |
76 |
- $(RANLIB) $@ |
|
|
77 |
+ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o |
| 76 |
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ |
78 |
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ |
| 77 |
+ |
79 |
+ |
| 78 |
+ $(LEXRLIB): $(LEXOBJS) |
80 |
+$(LEXRLIB): $(LEXOBJS) |
| 79 |
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ |
81 |
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ |
| 80 |
|
82 |
|
| 81 |
# Automatically generate header dependencies with "make deps" |
83 |
# Automatically generate header dependencies with "make deps" |