debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freetype: redo the way we detect and use

Browse Source 
We (configure) relies on freetype-config existing and telling us what
the proper includes and libs are.
This commit is contained in:
Jon Trulson
2020-01-05 17:49:02 -07:00
parent 4d12673147
commit 7f4889f348
4 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cde/lib/DtWidget/Makefile.am
View File

@@ -4,23 +4,17 @@ MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = libDtWidget.la
AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=${prefix} @DT_INCDIR@
AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) $(DT_INCDIR)
libDtWidget_la_CFLAGS = -DI18N_MSG -DMULTIBYTE
libDtWidget_la_CFLAGS = -DI18N_MSG -DMULTIBYTE $(FREETYPE_CFLAGS)
libDtWidget_la_LDFLAGS = -version-info 2:1:0
if LINUX
libDtWidget_la_CFLAGS += -I/usr/include/freetype2
endif
if BSD
libDtWidget_la_CFLAGS += -I/usr/local/include/freetype2
endif
libDtWidget_la_LIBADD = $(FREETYPE_LIBS)
if SOLARIS
libDtWidget_la_CFLAGS += -DNO_REGCOMP
libDtWidget_la_LIBADD = -lXm -lc -lw -lm -lintl
libDtWidget_la_LIBADD += -lc -lw -lintl
endif