| --- 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 |