From 295e9a81094f2a79a080e9c1f903a78b887f376d Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Sun, 19 Aug 2012 04:51:36 +0000 Subject: [PATCH] config/make.tmpl: Allow %(modname)_LIBS to specify additional libraries This will allow genmodule to supply additional 'uselibs' in the generated Makefile.%(modname) file. Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45598 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- config/make.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/make.tmpl b/config/make.tmpl index ed901fcba6..9a8f416545 100644 --- a/config/make.tmpl +++ b/config/make.tmpl @@ -1306,11 +1306,11 @@ endif %rule_linkmodule module=$(BD_MODULE) objs=$(BD_OBJS) \ endobj= err=$(BD_ERR) objdir=%(objdir) \ - uselibs="%(uselibs)" usehostlibs="%(usehostlibs)" + uselibs="%(uselibs) $(%(modname)_LIBS)" usehostlibs="%(usehostlibs)" %rule_linkmodule module=$(BD_PKGMOD) objs=$(BD_OBJS) \ endobj= err=$(BD_ERR) objdir=%(objdir) \ - uselibs="%(uselibs)" usehostlibs="%(usehostlibs)" + uselibs="%(uselibs) $(%(modname)_LIBS)" usehostlibs="%(usehostlibs)" # Link kernel object file BD_KAUTOLIB := dos intuition layers graphics oop utility expansion keymap @@ -1603,11 +1603,11 @@ endif # The module is linked from all the compiled .o files %rule_linkmodule module=$(BD_MODULE) objs="$(BD_STARTOBJS) $(BD_OBJS) $(USER_OBJS)" \ endobj=$(BD_ENDOBJS) err=$(BD_ERR) objdir=%(objdir) \ - uselibs="%(uselibs)" usehostlibs="%(usehostlibs)" + uselibs="%(uselibs) $(%(modname)_LIBS)" usehostlibs="%(usehostlibs)" %rule_linkmodule module=$(BD_PKGMOD) objs="$(BD_STARTOBJS) $(BD_OBJS) $(USER_OBJS)" \ endobj=$(BD_ENDOBJS) err=$(BD_ERR) objdir=%(objdir) \ - uselibs="%(uselibs)" usehostlibs="%(usehostlibs)" + uselibs="%(uselibs) $(%(modname)_LIBS)" usehostlibs="%(usehostlibs)" # Link static lib ifneq ($(BD_LINKLIB),) @@ -1642,7 +1642,7 @@ BD_SYMBOLS := $(BD_KBASE) BD_KLIB := hiddstubs amiga arossupport arosc.static arosm autoinit libinit BD_KOBJ_LIBS := $(filter-out $(BD_KLIB),%(uselibs)) $(BD_KAUTOLIB) -$(BD_KOBJ) : LINKLIBS:=$(BD_KOBJ_LIBS) +$(BD_KOBJ) : LINKLIBS:=$(BD_KOBJ_LIBS) $(%(modname)_LIBS) $(BD_KOBJ) : FILTBASES:=$(addprefix -L ,$(BD_SYMBOLS)) $(BD_KOBJ) : USER_LDFLAGS:=$(USER_LDFLAGS) $(BD_KOBJ) : $(BD_OBJS) $(USER_OBJS) $(BD_ENDOBJS) -- 2.11.4.GIT