Use *.* to select all files in the file selection dialog on Windows. Using shortcuts...

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index e35f66abe018874db34750e5f6cd1c5a3eaddb1d..8354f76bf08434110de15848118839773b96e14d 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -15,16 +15,16 @@ BUILT_SOURCES = $(PCH_FILE)
 #########################  Qt stuff  #############################
 #
 
-CLEANFILES += $(MOCEDFILES)
-BUILT_SOURCES += $(MOCEDFILES)
+MOCHEADER = SignalSlotPrivate.h
 
 MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
 
+CLEANFILES += $(MOCEDFILES)
+BUILT_SOURCES += $(MOCEDFILES)
+
 %_moc.cpp: %.h
        $(MOC4) -o $@ $<
 
-MOCHEADER =
-
 liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
 
 #
@@ -41,10 +41,8 @@ liblyxsupport_la_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
-       abort.cpp \
        convert.cpp \
        convert.h \
-       copy.cpp \
        copied_ptr.h \
        debug.cpp \
        debug.h \
@@ -59,13 +57,15 @@ liblyxsupport_la_SOURCES = \
        FileFilterList.h \
        FileName.cpp \
        FileName.h \
+       FileNameList.h \
        filetools.cpp \
        filetools.h \
+       FileZipListDir.h \
+       foreach.h \
        ForkedCalls.cpp \
        ForkedCalls.h \
        gettext.cpp \
        gettext.h \
-       getcwd.cpp \
        gzstream.cpp \
        gzstream.h \
        kill.cpp \
@@ -79,7 +79,6 @@ liblyxsupport_la_SOURCES = \
        lyxsum.cpp \
        Messages.cpp \
        Messages.h \
-       mkdir.cpp \
        os.cpp \
        os.h \
        Path.cpp \
@@ -87,7 +86,6 @@ liblyxsupport_la_SOURCES = \
        Package.cpp \
        Package.h \
        qstring_helpers.h \
-       rename.cpp \
        socktools.cpp \
        socktools.h \
        strfwd.h \
@@ -95,8 +93,8 @@ liblyxsupport_la_SOURCES = \
        Systemcall.h \
        SignalSlot.cpp \
        SignalSlot.h \
+       SignalSlotPrivate.cpp \
        SignalSlotPrivate.h \
-       tempname.cpp \
        textutils.h \
        Translator.h \
        Timeout.cpp \
@@ -106,6 +104,7 @@ liblyxsupport_la_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
+       weighted_btree.h \
        minizip/crypt.h \
        minizip/ioapi.c \
        minizip/ioapi.h \
@@ -117,6 +116,16 @@ liblyxsupport_la_SOURCES = \
        minizip/zip.h \
        minizip/zipunzip.cpp
 
+if INSTALL_MACOSX
+liblyxsupport_la_SOURCES += \
+       linkback/LinkBack.h \
+       linkback/LinkBack.m \
+       linkback/LinkBackProxy.h \
+       linkback/LinkBackProxy.m \
+       linkback/LinkBackServer.h \
+       linkback/LinkBackServer.m
+endif
+
 ############################## Tests ##################################
 
 EXTRA_DIST += \
@@ -129,29 +138,28 @@ EXTRA_DIST += \
 
 
 TESTS = \
-       test_convert \
-       test_filetools \
-       test_lstrings
+       tests/test_convert \
+       tests/test_filetools \
+       tests/test_lstrings
 
 check_PROGRAMS = \
        check_convert \
        check_filetools \
        check_lstrings
 
-check_convert_LDADD = ../debug.o convert.o docstring.o lstrings.o unicode.o \
+check_convert_LDADD = liblyxsupport.la  \
        $(BOOST_LIBS) $(QT4_CORE_LIB)
 check_convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_convert_SOURCES = \
        tests/check_convert.cpp \
        tests/boost.cpp
 
-check_filetools_LDADD = ../debug.o libsupport.la $(BOOST_LIBS)
+check_filetools_LDADD = liblyxsupport.la $(BOOST_LIBS)
 check_filetools_SOURCES = \
        tests/check_filetools.cpp \
        tests/boost.cpp
 
-check_lstrings_LDADD = ../debug.o lstrings.o convert.o docstring.o unicode.o \
-       $(QT4_CORE_LIB)
+check_lstrings_LDADD = liblyxsupport.la $(BOOST_LIBS) $(QT4_CORE_LIB)
 check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_lstrings_SOURCES = \
        tests/check_lstrings.cpp \
@@ -159,5 +167,5 @@ check_lstrings_SOURCES = \
 
 makeregfiles: ${check_PROGRAMS}
        for all in ${check_PROGRAMS} ; do \
-               ./$$all > ${srcdir}/regfiles/$$all ; \
+               ./$$all > ${srcdir}/tests/regfiles/$$all ; \
        done