freetype: redo the way we detect and use

[oweals/cde.git] / cde / lib / DtWidget / Makefile.am

diff --git a/cde/lib/DtWidget/Makefile.am b/cde/lib/DtWidget/Makefile.am
index 11237e8e937689f121b1ca872153a68ce816f68a..e09f4f5eae539abd9fefcdba9cb63eb8ab8b317e 100644 (file)
--- a/cde/lib/DtWidget/Makefile.am
+++ b/cde/lib/DtWidget/Makefile.am
@@ -4,31 +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$(x_includes)/freetype2
-endif
-
-if NETBSD
- libDtWidget_la_CFLAGS += -I$(x_includes)
-endif
+libDtWidget_la_LIBADD = $(FREETYPE_LIBS)
 
 if SOLARIS
 libDtWidget_la_CFLAGS += -DNO_REGCOMP
-libDtWidget_la_LIBADD = -lXm -lc -lw -lm -lintl
-endif
-
-if HPUX
-libDtWidget_la_CFLAGS += -DMESSAGE_CAT
+libDtWidget_la_LIBADD += -lc -lw -lintl
 endif