Fix bugs #6078 and #9364

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 6b8dd0c85009e2296330b48bb59bbdea23f06a94..ed6af579d18f2204306fce362fcd49db24517652 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,14 +1,10 @@
 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  #############################
 #
@@ -19,8 +15,8 @@ MOCHEADER = \
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
-CLEANFILES += $(MOCEDFILES)
-BUILT_SOURCES += $(MOCEDFILES)
+CLEANFILES = $(MOCEDFILES)
+BUILT_SOURCES = $(MOCEDFILES)
 
 moc_%.cpp: %.h
        $(QT_MOC) -o $@ $<
@@ -30,8 +26,7 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 #
 ##################################################################
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(QT_CPPFLAGS) $(QT_INCLUDES)
 
 liblyxsupport_a_SOURCES = \
        FileMonitor.h \
@@ -168,32 +163,32 @@ check_PROGRAMS = \
        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_LIB) $(LIBSHLWAPI) @LIBS@
-check_convert_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+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 $(LIBICONV) $(BOOST_LIBS) $(QT_LIB) $(LIBSHLWAPI) @LIBS@
-check_filetools_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+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 $(LIBICONV) $(BOOST_LIBS) $(QT_LIB) $(LIBSHLWAPI) @LIBS@
-check_lstrings_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+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_LIB) $(LIBSHLWAPI) @LIBS@
-check_trivstring_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+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 \