Cmake build: Omit also hidden header files from globbing

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index e5476619f37462c9bf9a096da73d77efc5bc98dd..ac43818e3e62c63464b480ff789dba4853c0386e 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -3,7 +3,8 @@ 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
+       os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
+       CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
 
 noinst_LIBRARIES = liblyxsupport.a
 
@@ -20,7 +21,7 @@ CLEANFILES += $(MOCEDFILES)
 BUILT_SOURCES += $(MOCEDFILES)
 
 moc_%.cpp: %.h
-       $(MOC4) -o $@ $<
+       $(QT_MOC) -o $@ $<
 
 liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -28,7 +29,7 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 ##################################################################
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) 
+AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_INCLUDES)
 
 liblyxsupport_a_SOURCES = \
        FileMonitor.h \
@@ -38,8 +39,6 @@ liblyxsupport_a_SOURCES = \
        convert.cpp \
        convert.h \
        copied_ptr.h \
-       CryptographicEncryption.h \
-       CryptographicEncryption.cpp \
        debug.cpp \
        debug.h \
        docstream.cpp \
@@ -58,6 +57,7 @@ liblyxsupport_a_SOURCES = \
        foreach.h \
        ForkedCalls.cpp \
        ForkedCalls.h \
+       functional.h \
        gettext.cpp \
        gettext.h \
        gzstream.cpp \
@@ -72,18 +72,22 @@ liblyxsupport_a_SOURCES = \
        lyxlib.h \
        lyxtime.cpp \
        lyxtime.h \
+       mutex.h \
+       mutex.cpp \
        Messages.cpp \
        Messages.h \
        numpunct_lyx_char_type.h \
        os.cpp \
        os.h \
-       Path.cpp \
-       Path.h \
+       PathChanger.cpp \
+       PathChanger.h \
        Package.cpp \
        Package.h \
        ProgressInterface.h \
+       pmprof.h \
        qstring_helpers.cpp \
        qstring_helpers.h \
+       regex.h \
        socktools.cpp \
        socktools.h \
        strfwd.h \
@@ -91,6 +95,8 @@ liblyxsupport_a_SOURCES = \
        Systemcall.h \
        SystemcallPrivate.h \
        shared_ptr.h \
+       TempFile.cpp \
+       TempFile.h \
        textutils.h \
        Translator.h \
        Timeout.cpp \
@@ -100,10 +106,13 @@ liblyxsupport_a_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
-       weighted_btree.h \
+       weighted_btree.h
+if USE_INCLUDED_MYTHES
+liblyxsupport_a_SOURCES += \
        mythes/mythes.cxx \
        mythes/mythes.hxx \
        mythes/license.readme
+endif
 
 #if INSTALL_MACOSX
 #liblyxsupport_a_SOURCES += \
@@ -115,6 +124,9 @@ if INSTALL_MACOSX
 liblyxsupport_a_SOURCES += \
        AppleSpeller.h \
        AppleSpeller.m \
+       AppleScript.h \
+       AppleScript.m \
+       AppleScriptProxy.cpp \
        linkback/LinkBack.h \
        linkback/LinkBack.m \
        linkback/LinkBackProxy.h \
@@ -144,22 +156,29 @@ check_PROGRAMS = \
        check_filetools \
        check_lstrings
 
-check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
-check_convert_LDFLAGS = $(QT4_LDFLAGS)
+if INSTALL_MACOSX
+ADD_FRAMEWORKS = -framework QtGui -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_SOURCES = \
        tests/check_convert.cpp \
+       tests/dummy_functions.cpp \
        tests/boost.cpp
 
-check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
-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)
-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
 
 makeregfiles: ${check_PROGRAMS}