Fix bugs #6078 and #9364

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index a537ff8da5b7c6e73d1a354ae823304131173943..ed6af579d18f2204306fce362fcd49db24517652 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,40 +1,41 @@
 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
-       $(MOC4) -o $@ $<
+       $(QT_MOC) -o $@ $<
 
 liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
 #
 ##################################################################
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_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 \
@@ -83,6 +84,7 @@ liblyxsupport_a_SOURCES = \
        Package.cpp \
        Package.h \
        ProgressInterface.h \
+       pmprof.h \
        qstring_helpers.cpp \
        qstring_helpers.h \
        regex.h \
@@ -93,10 +95,14 @@ liblyxsupport_a_SOURCES = \
        Systemcall.h \
        SystemcallPrivate.h \
        shared_ptr.h \
+       TempFile.cpp \
+       TempFile.h \
        textutils.h \
        Translator.h \
        Timeout.cpp \
        Timeout.h \
+       trivstring.cpp \
+       trivstring.h \
        types.h \
        userinfo.cpp \
        userinfo.h \
@@ -137,42 +143,57 @@ 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 QtCore -framework AppKit -framework ApplicationServices
+endif
 
-check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-check_convert_LDFLAGS = $(QT4_LDFLAGS)
+check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_convert_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_convert_SOURCES = \
        tests/check_convert.cpp \
        tests/dummy_functions.cpp \
        tests/boost.cpp
 
-check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_filetools_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_filetools_SOURCES = \
        tests/check_filetools.cpp \
        tests/dummy_functions.cpp \
        tests/boost.cpp
 
-check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_lstrings_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_lstrings_SOURCES = \
        tests/check_lstrings.cpp \
        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 ; \