Add forgotten zlib includes

[lyx.git] / src / support / Makefile.am

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 52e31aa85993fd7faaace521d7b8eb60654df280..d1137290ee4646dcf0e6eeb4fb5020f269ee616e 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,23 +1,22 @@
 include $(top_srcdir)/config/common.am
 
-CLEANFILES += $(BUILT_SOURCES)
-
-EXTRA_DIST = pch.h \
-       os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
+EXTRA_DIST = os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
+       CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
 
 noinst_LIBRARIES = liblyxsupport.a
 
-BUILT_SOURCES = $(PCH_FILE)
 
 #########################  Qt stuff  #############################
 #
 
-MOCHEADER = SystemcallPrivate.h
+MOCHEADER = \
+       ConsoleApplicationPrivate.h \
+       SystemcallPrivate.h
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
-CLEANFILES += $(MOCEDFILES)
-BUILT_SOURCES += $(MOCEDFILES)
+CLEANFILES = $(MOCEDFILES)
+BUILT_SOURCES = $(MOCEDFILES)
 
 moc_%.cpp: %.h
        $(QT_MOC) -o $@ $<
@@ -27,14 +26,17 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 #
 ##################################################################
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES) \
+       $(QT_CPPFLAGS) $(QT_INCLUDES)
 
 liblyxsupport_a_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
        bind.h \
+       ConsoleApplication.cpp \
+       ConsoleApplication.h \
+       ConsoleApplicationPrivate.h \
        convert.cpp \
        convert.h \
        copied_ptr.h \
@@ -100,6 +102,8 @@ liblyxsupport_a_SOURCES = \
        Translator.h \
        Timeout.cpp \
        Timeout.h \
+       trivstring.cpp \
+       trivstring.h \
        types.h \
        userinfo.cpp \
        userinfo.h \
@@ -140,27 +144,31 @@ EXTRA_DIST += \
        tests/test_convert \
        tests/test_filetools \
        tests/test_lstrings \
+       tests/test_trivstring \
        tests/regfiles/convert \
        tests/regfiles/filetools \
-       tests/regfiles/lstrings
+       tests/regfiles/lstrings \
+       tests/regfiles/trivstring
 
 
 TESTS = \
        tests/test_convert \
        tests/test_filetools \
-       tests/test_lstrings
+       tests/test_lstrings \
+       tests/test_trivstring
 
 check_PROGRAMS = \
        check_convert \
        check_filetools \
-       check_lstrings
+       check_lstrings \
+       check_trivstring
 
 if INSTALL_MACOSX
-ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
+ADD_FRAMEWORKS = -framework QtCore -framework AppKit -framework ApplicationServices
 endif
 
 check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
-check_convert_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_convert_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_convert_SOURCES = \
        tests/check_convert.cpp \
        tests/dummy_functions.cpp \
@@ -180,6 +188,13 @@ check_lstrings_SOURCES = \
        tests/dummy_functions.cpp \
        tests/boost.cpp
 
+check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_trivstring_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_trivstring_SOURCES = \
+       tests/check_trivstring.cpp \
+       tests/dummy_functions.cpp \
+       tests/boost.cpp
+
 makeregfiles: ${check_PROGRAMS}
        for all in ${check_PROGRAMS} ; do \
                ./$$all > ${srcdir}/tests/regfiles/$$all ; \