blob: 615abcee6e877d424af2c2b73ae78f90733785f9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
--- fxscintilla-1.71-orig/src/Makefile.am 2006-09-25 21:00:18.000000000 +0000
+++ fxscintilla-1.71/src/Makefile.am 2006-10-24 22:13:30.000000000 +0000
@@ -17,16 +17,20 @@
AM_LDFLAGS = -mwindows
endif # MinGW32
-lib_LTLIBRARIES = libfxscintilla.la
+lib_LTLIBRARIES =
-libfxscintilla_la_SOURCES = \
+if HAVE_FOX_1_2
+lib_LTLIBRARIES += libfxscintilla-1.2.la
+
+libfxscintilla_1_2_la_SOURCES = \
PlatFOX.cxx \
ScintillaFOX.cxx
-libfxscintilla_la_LIBADD = \
- $(top_builddir)/scintilla/src/libscintilla.la
+libfxscintilla_1_2_la_LIBADD = \
+ $(top_builddir)/scintilla/src/libscintilla.la \
+ -L$(FOX_LIB_DIR) -lFOX-1.2
-libfxscintilla_la_LDFLAGS = \
+libfxscintilla_1_2_la_LDFLAGS = \
-version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
libfxscintilla_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
@@ -34,16 +38,88 @@
## NoLexer enabled
if NOLEXER
-lib_LTLIBRARIES += libfxscintillanolexer.la
+lib_LTLIBRARIES += libfxscintillanolexer-1.2.la
+
+libfxscintillanolexer_1_2_la_SOURCES = \
+ PlatFOX.cxx \
+ ScintillaFOX.cxx
+
+libfxscintillanolexer_1_2_la_LIBADD = \
+ $(top_builddir)/scintilla/src/libscintillanolexer.la \
+ -L$(FOX_LIB_DIR) -lFOX-1.2
+
+libfxscintillanolexer_1_2_la_LDFLAGS = \
+ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
+
+endif # NOLEXER
+endif # HAVE_FOX_1_2
+
+if HAVE_FOX_1_4
+lib_LTLIBRARIES += libfxscintilla-1.4.la
+
+libfxscintilla_1_4_la_SOURCES = \
+ PlatFOX.cxx \
+ ScintillaFOX.cxx
+
+libfxscintilla_1_4_la_LIBADD = \
+ $(top_builddir)/scintilla/src/libscintilla.la \
+ -L$(FOX_LIB_DIR) -lFOX-1.4
+
+libfxscintilla_1_4_la_LDFLAGS = \
+ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
+
+libfxscintilla_1_4_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
+
+## NoLexer enabled
+if NOLEXER
+
+lib_LTLIBRARIES += libfxscintillanolexer-1.4.la
-libfxscintillanolexer_la_SOURCES = \
+libfxscintillanolexer_1_4_la_SOURCES = \
PlatFOX.cxx \
ScintillaFOX.cxx
-libfxscintillanolexer_la_LIBADD = $(top_builddir)/scintilla/src/libscintillanolexer.la
+libfxscintillanolexer_1_4_la_LIBADD = \
+ $(top_builddir)/scintilla/src/libscintillanolexer.la \
+ -L$(FOX_LIB_DIR) -lFOX-1.4
-libfxscintillanolexer_la_LDFLAGS = \
+libfxscintillanolexer_1_4_la_LDFLAGS = \
-version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
endif # NOLEXER
+endif # HAVE_FOX_1_4
+
+if HAVE_FOX_1_6
+lib_LTLIBRARIES += libfxscintilla-1.6.la
+
+libfxscintilla_1_6_la_SOURCES = \
+ PlatFOX.cxx \
+ ScintillaFOX.cxx
+
+libfxscintilla_1_6_la_LIBADD = \
+ $(top_builddir)/scintilla/src/libscintilla.la \
+ -L$(FOX_LIB_DIR) -lFOX-1.6
+
+libfxscintilla_1_6_la_LDFLAGS = \
+ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
+
+libfxscintilla_1_6_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
+
+## NoLexer enabled
+if NOLEXER
+
+lib_LTLIBRARIES += libfxscintillanolexer-1.6.la
+
+libfxscintillanolexer_1_6_la_SOURCES = \
+ PlatFOX.cxx \
+ ScintillaFOX.cxx
+
+libfxscintillanolexer_1_6_la_LIBADD = \
+ $(top_builddir)/scintilla/src/libscintillanolexer.la \
+ -L$(FOX_LIB_DIR) -lFOX-1.6
+libfxscintillanolexer_1_6_la_LDFLAGS = \
+ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
+
+endif # NOLEXER
+endif # HAVE_FOX_1_6
--- fxscintilla-1.71-orig/tests/Makefile.am 2006-09-25 21:00:18.000000000 +0000
+++ fxscintilla-1.71/tests/Makefile.am 2006-10-24 22:11:04.000000000 +0000
@@ -1,16 +1,15 @@
INCLUDES = -I$(top_srcdir)/include -I$(FOX_INCLUDE_DIR)
-LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la
if HAVE_FOX_1_2
-LDADD += -lFOX-1.2
+LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.2.la -lFOX-1.2
endif
if HAVE_FOX_1_4
-LDADD += -lFOX-1.4
+LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.4.la -lFOX-1.4
endif
if HAVE_FOX_1_6
-LDADD += -lFOX-1.6
+LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.6.la -lFOX-1.6
endif
AM_CXXFLAGS = $(PTHREAD_CFLAGS) -W -Wall -DFOX -DSCI_LEXER
|
GitWeb