From 69bedface3df02b2bf1107a96706097f2c4000b8 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Sat, 25 Aug 2012 01:13:00 +0000 Subject: [PATCH] freetype2: Follow the 'standard' naming conventions For the shared library: uselibs=freetype2 For the static library uselibs=freetype2.static Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45647 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/freetype/src/mmakefile.src | 4 ++-- workbench/system/ftmanager/mmakefile.src | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workbench/libs/freetype/src/mmakefile.src b/workbench/libs/freetype/src/mmakefile.src index 43aaeb14fd..0e17379e0a 100644 --- a/workbench/libs/freetype/src/mmakefile.src +++ b/workbench/libs/freetype/src/mmakefile.src @@ -64,9 +64,9 @@ USER_CFLAGS += -Wno-error #MM workbench-libs-freetype-linklib : workbench-libs-freetype-includes #MM workbench-libs-freetype-module : workbench-libs-freetype-includes -%build_linklib mmake=workbench-libs-freetype-linklib libname=freetype2 \ +%build_linklib mmake=workbench-libs-freetype-linklib libname=freetype2.static \ files=$(FT2FILES) %build_module mmake=workbench-libs-freetype-module modname=freetype2 \ - modtype=library files="$(SHFILES) $(FT2FILES)" linklibname=freetype2shared + modtype=library files="$(SHFILES) $(FT2FILES)" diff --git a/workbench/system/ftmanager/mmakefile.src b/workbench/system/ftmanager/mmakefile.src index dfd90a976b..acfb3683df 100644 --- a/workbench/system/ftmanager/mmakefile.src +++ b/workbench/system/ftmanager/mmakefile.src @@ -10,6 +10,6 @@ EXEDIR := $(AROS_SYSTEM) %build_prog mmake=workbench-system-ftmanager \ progname=FTManager targetdir=$(EXEDIR) \ - files=$(FILES) uselibs="freetype2shared mui" + files=$(FILES) uselibs="freetype2 mui" %common -- 2.11.4.GIT