Lines 1-4
Link Here
|
1 |
--- makefile.orig 2018-04-10 01:38:39 UTC |
1 |
--- makefile.orig 2019-04-16 20:34:45 UTC |
2 |
+++ makefile |
2 |
+++ makefile |
3 |
@@ -11,9 +11,7 @@ |
3 |
@@ -11,9 +11,7 @@ |
4 |
srcdir ?= . |
4 |
srcdir ?= . |
Lines 24-30
Link Here
|
24 |
endif |
24 |
endif |
25 |
|
25 |
|
26 |
vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib |
26 |
vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib |
27 |
@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(RE |
27 |
@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS) |
28 |
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) |
28 |
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) |
29 |
MARSHALLER=scintilla-marshal.o |
29 |
MARSHALLER=scintilla-marshal.o |
30 |
|
30 |
|
Lines 33-42
Link Here
|
33 |
|
33 |
|
34 |
clean: |
34 |
clean: |
35 |
$(DEL) *.o $(COMPLIB) *.plist |
35 |
$(DEL) *.o $(COMPLIB) *.plist |
36 |
@@ -123,9 +126,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De |
36 |
@@ -119,9 +122,11 @@ $(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o L |
37 |
PropSetSimple.o PlatGTK.o \ |
37 |
PropSetSimple.o PlatGTK.o \ |
38 |
KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \ |
38 |
KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \ |
39 |
RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ |
39 |
RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o UniqueString.o XPM.o \ |
40 |
- $(MARSHALLER) $(LEXOBJS) |
40 |
- $(MARSHALLER) $(LEXOBJS) |
41 |
- $(AR) $(ARFLAGS) $@ $^ |
41 |
- $(AR) $(ARFLAGS) $@ $^ |
42 |
- $(RANLIB) $@ |
42 |
- $(RANLIB) $@ |