blob: f242d49f57f5d20673f2e38c3aa8f8f76017f497 (
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
|
--- makefile.orig Fri Aug 20 09:21:00 2004
+++ makefile Thu Feb 3 19:14:13 2005
@@ -5,7 +5,7 @@
# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
.SUFFIXES: .cxx .o .h .a .c
-CC = g++
+CC ?= g++
AR = ar
# If explicit setting of GTK1 or GTK2 then use that else look for
@@ -28,10 +28,10 @@
CONFIGTHREADS=
gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
else
-CONFIGFLAGS=gtk-config --cflags
-CONFIGLIB=gtk-config --libs
+CONFIGFLAGS=pkg-config --cflags gtk+
+CONFIGLIB=pkg-config --libs gtk+
CONFIGTHREADS=glib-config --libs gthread
-gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
+gnomeprefix:=$(PREFIX)
endif
ifndef prefix
ifdef gnomeprefix
@@ -51,17 +51,17 @@
all: $(PROG)
-vpath %.h ../src ../../scintilla/include
+vpath %.h ../src $(X11BASE)/include/scintilla
vpath %.cxx ../src
#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
+INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
else
-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
endif
ifndef NO_LUA
@@ -102,8 +102,9 @@
$(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
- $(COMPLIB) $(LUA_OBJS)
- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`
+ $(LUA_OBJS)
+ $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \
+ `$(CONFIGTHREADS)` -DGTK $^ -o $@
# Automatically generate header dependencies with "make deps"
include deps.mak
|
