125 lines
4.8 KiB
Plaintext
125 lines
4.8 KiB
Plaintext
$OpenBSD: patch-gtk_makefile,v 1.5 2010/10/03 18:09:01 jeremy Exp $
|
|
--- gtk/makefile.orig Sun Aug 29 05:55:22 2010
|
|
+++ gtk/makefile Sat Oct 2 19:46:19 2010
|
|
@@ -18,20 +18,21 @@ AR = ar
|
|
CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
|
|
CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
|
|
CONFIGTHREADS:=
|
|
-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
|
|
+#gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
|
|
ifndef prefix
|
|
ifdef gnomeprefix
|
|
prefix=$(gnomeprefix)
|
|
else
|
|
- prefix=/usr
|
|
+ prefix=${PREFIX}
|
|
endif
|
|
endif
|
|
datadir=$(prefix)/share
|
|
pixmapdir=$(datadir)/pixmaps
|
|
bindir=$(prefix)/bin
|
|
SYSCONF_PATH=$(prefix)/share/scite
|
|
+DOC_PATH=$(prefix)/share/doc/scite
|
|
|
|
-INSTALL=install
|
|
+INSTALL=install -o root -g bin
|
|
|
|
PROG = ../bin/SciTE
|
|
|
|
@@ -40,17 +41,19 @@ all: $(PROG)
|
|
vpath %.h ../src ../../scintilla/include
|
|
vpath %.cxx ../src
|
|
|
|
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
|
|
+INCLUDEDIRS=-I ${prefix}/include/scintilla -I ../src -I ${prefix}/include
|
|
#~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
|
|
-CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
|
|
+CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
|
|
|
|
ifdef DEBUG
|
|
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
|
|
+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
|
|
else
|
|
-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
|
|
+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
|
|
endif
|
|
|
|
-ifndef NO_LUA
|
|
+LIBS= -L $(prefix)/lib -lscintilla -lscintilla_lexers
|
|
+
|
|
+ifdef LUA
|
|
LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
|
|
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
|
|
ltable.o ltm.o lundump.o lvm.o lzio.o
|
|
@@ -60,14 +63,14 @@ LUA_LIB_OBJS = lauxlib.o lbaselib.o ldblib.o liolib.o
|
|
|
|
LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
|
|
|
|
-INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
|
|
+INCLUDEDIRS+=-I../lua/include
|
|
$(LUA_CORE_OBJS): ../lua/src/*.c
|
|
$(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
|
|
$(LUA_LIB_OBJS): ../lua/src/lib/*.c
|
|
$(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
|
|
-CXXFLAGS=$(CXXTFLAGS)
|
|
+CXXFLAGS+=$(CXXTFLAGS)
|
|
else
|
|
-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
|
|
+CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA
|
|
endif
|
|
|
|
ifeq ($(shell uname), Darwin)
|
|
@@ -75,22 +78,19 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
|
|
endif
|
|
|
|
.cxx.o:
|
|
- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
|
|
+ $(CXX) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
|
|
|
|
clean:
|
|
rm -f *.o $(PROG)
|
|
|
|
deps:
|
|
- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
|
|
+ $(CXX) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
|
|
|
|
-# make should be run in ../../scintilla/gtk to compile all the lexers.
|
|
-COMPLIB=../../scintilla/bin/scintilla.a
|
|
-
|
|
$(PROG): SciTEGTK.o GUIGTK.o Widget.o \
|
|
-FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
|
|
-PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
|
|
+ FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
|
|
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
|
|
JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
|
|
- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
|
|
+ $(CXX) $(CONFIGTHREADS) $(LIBS) -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -lstdc++
|
|
|
|
# Automatically generate header dependencies with "make deps"
|
|
include deps.mak
|
|
@@ -99,18 +99,16 @@ include deps.mak
|
|
# This is OK - just means no SciTE in the Gnome Applications menu
|
|
# Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
|
|
install:
|
|
- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(SYSCONF_PATH)
|
|
+ $(INSTALL) -m 755 -d $(bindir) $(SYSCONF_PATH)
|
|
|
|
- $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
|
|
+ $(INSTALL) -m 755 $(PROG) $(bindir)
|
|
+ $(INSTALL) -m 755 -d $(SYSCONF_PATH) $(DOC_PATH)
|
|
+ $(INSTALL) -m 444 ../src/*.properties $(SYSCONF_PATH)
|
|
+ $(INSTALL) -m 444 ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png $(DOC_PATH)
|
|
|
|
- for files in ../src/*.properties ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png; \
|
|
- do \
|
|
- $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
|
|
- done
|
|
-
|
|
ifdef gnomeprefix
|
|
$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
|
|
- $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
|
|
+ $(INSTALL) -m 444 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
|
|
endif
|
|
|
|
uninstall:
|