$FreeBSD$ --- makefile.orig Sun Apr 15 10:24:36 2001 +++ makefile Tue Apr 17 14:04:58 2001 @@ -5,10 +5,11 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. .SUFFIXES: .cxx .o .h .a -CC = g++ -AR = ar +CC ?= g++ +AR = $(CC) -shared -COMPLIB=../bin/scintilla.a +COMPLIB=../bin/libscintilla.so.1 +LEXRLIB=../bin/libscintilla_lexers.so.1 vpath %.h ../src ../include vpath %.cxx ../src @@ -17,20 +18,20 @@ CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS) ifdef DEBUG -CXXFLAGS=-DDEBUG $(CXXBASEFLAGS) +CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS) else -CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS) +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) endif .cxx.o: - $(CC) `gtk-config --cflags` $(CXXFLAGS) -c $< + $(CC) -DPIC -fPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $< LEXOBJS = LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o \ LexOthers.o LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o # The LEXOBJS have to be treated specially as the functions in them are not called from external code -all: $(COMPLIB) $(LEXOBJS) +all: $(COMPLIB) $(LEXRLIB) clean: rm -f *.o $(COMPLIB) @@ -42,7 +43,10 @@ ScintillaBase.o ContractionState.o Editor.o PropSet.o PlatGTK.o \ KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ RESearch.o Style.o Indicator.o AutoComplete.o - $(AR) rc $@ $^ + $(AR) -o $@ $^ + +$(LEXRLIB): $(LEXOBJS) + $(AR) -o $@ $^ # Automatically generate header dependencies with "make deps" include deps.mak