From 50d39d64cbd77071d34a4fd2db33b1f1909ce8be Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 3 Mar 2020 09:30:20 +0900 Subject: [PATCH] [qwaq] Link against build ruamoko libs, not installed --- ruamoko/qwaq/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am index 38584d949..f32d9d536 100644 --- a/ruamoko/qwaq/Makefile.am +++ b/ruamoko/qwaq/Makefile.am @@ -13,7 +13,9 @@ QFCC=$(top_builddir)/tools/qfcc/source/qfcc QCFLAGS=-qq -O -g -Werror QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include +QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) +QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS) SUFFIXES=.o .r .r.o: @@ -61,7 +63,7 @@ qwaq_app_dat_SOURCES=qwaq-app.r qwaq-screen.r qwaq-window.r qwaq-view.r qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o) qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo)) qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(qwaq_app_obj) -lr + $(QLINK) -o $@ $(qwaq_app_obj) -lr include $(qwaq_app_dep) # am--include-marker r_depfiles_remade += $(qwaq_app_dep)