diff -Naur a/lexilla/src/makefile b/lexilla/src/makefile --- a/lexilla/src/makefile 2025-02-05 13:44:27.807344949 -0500 +++ b/lexilla/src/makefile 2025-02-05 14:09:19.668976650 -0500 @@ -15,7 +15,7 @@ .SUFFIXES: .cxx DIR_O=. -DIR_BIN=../bin +DIR_BIN=$(DIR_O)/../bin WARNINGS = -Wpedantic -Wall -Wextra @@ -73,15 +73,15 @@ RANLIB ?= ranlib -SCINTILLA_INCLUDE = ../../scintilla/include +SCINTILLA_INCLUDE = $(DIR_O)/../../scintilla/include -vpath %.h ../include ../../scintilla/include ../lexlib -vpath %.cxx ../src ../lexlib ../lexers +vpath %.h $(DIR_O)/../include $(DIR_O)/../../scintilla/include $(DIR_O)/../lexlib +vpath %.cxx $(DIR_O)/../src $(DIR_O)/../lexlib $(DIR_O)/../lexers DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) BASE_FLAGS += $(if $(DEBUG),-g,-O3) -INCLUDES = -I ../include -I $(SCINTILLA_INCLUDE) -I ../lexlib +INCLUDES = -I $(DIR_O)/../include -I $(SCINTILLA_INCLUDE) -I $(DIR_O)/../lexlib LDFLAGS += -shared BASE_FLAGS += $(WARNINGS) @@ -98,15 +98,15 @@ $(WINDRES) $< $@ analyze: - $(CXX) --analyze $(DEFINES) $(INCLUDES) $(BASE_FLAGS) $(CXXFLAGS) *.cxx ../lexlib/*.cxx ../lexers/*.cxx + $(CXX) --analyze $(DEFINES) $(INCLUDES) $(BASE_FLAGS) $(CXXFLAGS) *.cxx $(DIR_O)/../lexlib/*.cxx $(DIR_O)/../lexers/*.cxx depend deps.mak: $(PYTHON) DepGen.py $(SCINTILLA_INCLUDE): - @echo Scintilla must be installed at ../../scintilla to provide access to Scintilla headers. + @echo Scintilla must be installed at $(DIR_O)/../../scintilla to provide access to Scintilla headers. -LEXERS:=$(sort $(notdir $(wildcard ../lexers/Lex*.cxx))) +LEXERS:=$(sort $(notdir $(wildcard $(DIR_O)/../lexers/Lex*.cxx))) OBJS = Lexilla.o diff -Naur a/scite/gtk/makefile b/scite/gtk/makefile --- a/scite/gtk/makefile 2025-02-05 13:44:27.844011165 -0500 +++ b/scite/gtk/makefile 2025-02-05 14:33:01.841495411 -0500 @@ -57,8 +57,8 @@ # make should be run in ../../scintilla/gtk to compile all the lexers. SHAREDEXTENSION = $(if $(windir),dll,so) COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a -COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION) -LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION) +COMPONENT=$(SCINTILLA_DIR)/bin/libscintilla.$(SHAREDEXTENSION) +LEXILLA=$(LEXILLA_DIR)/bin/liblexilla.$(SHAREDEXTENSION) all: $(PROG) $(COMPONENT) $(LEXILLA) @@ -116,10 +116,10 @@ depend deps.mak: $(PYTHON) AppDepGen.py -../bin/%.$(SHAREDEXTENSION): ../../scintilla/bin/%.$(SHAREDEXTENSION) +$(srcdir)/../bin/%.$(SHAREDEXTENSION): $(SCINTILLA_DIR)/bin/%.$(SHAREDEXTENSION) $(COPY) $< $(@D) -../bin/%.$(SHAREDEXTENSION): ../../lexilla/bin/%.$(SHAREDEXTENSION) +$(srcdir)/../bin/%.$(SHAREDEXTENSION): $(LEXILLA_DIR)/bin/%.$(SHAREDEXTENSION) $(COPY) $< $(@D) # To almost make lua.vers (needs header and footer added) which is only needed after updating Lua: @@ -156,7 +156,7 @@ Utf8_16.o $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS) - $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS) + $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L $(SCINTILLA_DIR)/bin -lscintilla $(LDLIBS) # Automatically generate header dependencies with "make depend" include deps.mak