From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:19:22 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kcontrol/tdefontinst/kcmfontinst/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kcontrol/tdefontinst/kcmfontinst/Makefile.am') diff --git a/kcontrol/tdefontinst/kcmfontinst/Makefile.am b/kcontrol/tdefontinst/kcmfontinst/Makefile.am index 7a4c78920..b6e658096 100644 --- a/kcontrol/tdefontinst/kcmfontinst/Makefile.am +++ b/kcontrol/tdefontinst/kcmfontinst/Makefile.am @@ -1,10 +1,10 @@ if include_fontinst_tn FONTINST_PRINT_INC=-I$(srcdir)/../viewpart -FONTINST_PRINT_LIB=../viewpart/libkfontinstprint.la +FONTINST_PRINT_LIB=../viewpart/libtdefontinstprint.la endif kde_module_LTLIBRARIES = kcm_fontinst.la -kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libkfontinst.la +kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la METASOURCES = AUTO kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -- cgit v1.2.1