aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/makefile')
-rw-r--r--gtk/makefile14
1 files changed, 4 insertions, 10 deletions
diff --git a/gtk/makefile b/gtk/makefile
index 8967a16b8..1befa1183 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -69,12 +69,12 @@ endif
COMPLIB=$(basedir)/bin/scintilla.a
COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
-vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
+vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
vpath %.c $(srcdir)
-vpath %.cxx $(srcdir) $(basedir)/src $(basedir)/lexlib $(basedir)/lexers
+vpath %.cxx $(srcdir) $(basedir)/src
-INCLUDES=-I $(basedir)/include -I $(basedir)/src -I $(basedir)/lexlib
-DEFINES += -DGTK -DSCI_LEXER
+INCLUDES=-I $(basedir)/include -I $(basedir)/src
+DEFINES += -DGTK
BASE_FLAGS += $(WARNINGS)
ifdef NO_CXX11_REGEX
@@ -167,11 +167,5 @@ $(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS)
$(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
-Catalogue.o: Catalogue.cxx
- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@
-
-CatalogueL.o: Catalogue.cxx
- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
-
# Automatically generate header dependencies with "make deps"
include deps.mak