X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FMakefile.am;h=a8f233e25a74f6367f7765556653d95a2cdf8632;hb=e26a60edef3eae39c2e8379f395febedc5ba7efa;hp=cb17040b123fc231cb3140c06255e7a9b6c31d00;hpb=adcb084ea282d8854467b4cce382b4d5fe85943e;p=features.git

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index cb17040b12..a8f233e25a 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -2,23 +2,23 @@ include $(top_srcdir)/config/common.am
 
 SUBDIRS = $(FRONTENDS_SUBDIRS) .
 
-DIST_SUBDIRS = qt4 .
+DIST_SUBDIRS = qt .
 
-noinst_LTLIBRARIES = liblyxfrontends.la
+noinst_LIBRARIES = liblyxfrontends.a
 
-AM_CPPFLAGS += -I$(srcdir)/..  $(BOOST_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. \
+	$(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) $(NOD_INCLUDES)
 
-liblyxfrontends_la_SOURCES = \
+liblyxfrontends_a_SOURCES = \
 	alert.h \
 	Application.h \
-	NoGuiFontLoader.h \
-	NoGuiFontMetrics.h \
-	FileDialog.h \
+	CaretGeometry.h \
 	FontLoader.h \
 	FontMetrics.h \
+	Delegates.h \
 	KeyModifier.h \
 	KeySymbol.h \
-	LyXView.h \
+	NullPainter.h \
 	Painter.h \
 	Clipboard.h \
 	Selection.h \
@@ -29,20 +29,25 @@ liblyxfrontends_la_SOURCES = \
 
 ################################# Tests ################################
 
-EXTRA_DIST = tests/test_biblio
+EXTRA_DIST = \
+	CMakeLists.txt \
+	tests/CMakeLists.txt \
+	tests/test_biblio.cmake \
+	tests/test_biblio \
+	tests/regfiles/biblio
 
 TESTS = \
-	test_biblio
+	tests/test_biblio
 
 check_PROGRAMS = \
 	biblio
 
-biblio_LDADD = $(BOOST_REGEX)
+biblio_LDADD = $(ICONV_LIBS) $(ZLIB_LIBS)
 biblio_SOURCES = \
 	tests/biblio.cpp \
 	tests/boost.cpp
 
 makeregfiles: ${check_PROGRAMS}
 	for all in ${check_PROGRAMS} ; do \
-		./$$all > ${srcdir}/regfiles/$$all ; \
+		./$$all > ${srcdir}/tests/regfiles/$$all ; \
 	done