Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 883e4faf6b9be341509523ccebc2e0a199439c24..86c5f4d7f2909a8ca728a2b6c2c3c5f3adfb26b6 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -12,6 +12,24 @@ liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
 
 BUILT_SOURCES = $(PCH_FILE)
 
+#########################  Qt stuff  #############################
+#
+
+MOCHEADER = SignalSlotPrivate.h
+
+MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
+
+CLEANFILES += $(MOCEDFILES)
+BUILT_SOURCES += $(MOCEDFILES)
+
+%_moc.cpp: %.h
+       $(MOC4) -o $@ $<
+
+liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
+
+#
+##################################################################
+
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) -I$(srcdir)/minizip
 
@@ -23,13 +41,13 @@ liblyxsupport_la_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
-       abort.cpp \
-       chdir.cpp \
+       assert.h \
+       assert.cpp \
        convert.cpp \
        convert.h \
-       copy.cpp \
        copied_ptr.h \
-       cow_ptr.h \
+       debug.cpp \
+       debug.h \
        docstream.cpp \
        docstream.h \
        docstring.cpp \
@@ -41,15 +59,15 @@ liblyxsupport_la_SOURCES = \
        FileFilterList.h \
        FileName.cpp \
        FileName.h \
+       FileNameList.h \
        filetools.cpp \
        filetools.h \
-       Forkedcall.cpp \
-       Forkedcall.h \
-       ForkedCallQueue.cpp \
-       ForkedCallQueue.h \
-       ForkedcallsController.cpp \
-       ForkedcallsController.h \
-       getcwd.cpp \
+       FileZipListDir.h \
+       foreach.h \
+       ForkedCalls.cpp \
+       ForkedCalls.h \
+       gettext.cpp \
+       gettext.h \
        gzstream.cpp \
        gzstream.h \
        kill.cpp \
@@ -61,7 +79,8 @@ liblyxsupport_la_SOURCES = \
        lyxtime.cpp \
        lyxtime.h \
        lyxsum.cpp \
-       mkdir.cpp \
+       Messages.cpp \
+       Messages.h \
        os.cpp \
        os.h \
        Path.cpp \
@@ -69,7 +88,6 @@ liblyxsupport_la_SOURCES = \
        Package.cpp \
        Package.h \
        qstring_helpers.h \
-       rename.cpp \
        socktools.cpp \
        socktools.h \
        strfwd.h \
@@ -77,8 +95,8 @@ liblyxsupport_la_SOURCES = \
        Systemcall.h \
        SignalSlot.cpp \
        SignalSlot.h \
+       SignalSlotPrivate.cpp \
        SignalSlotPrivate.h \
-       tempname.cpp \
        textutils.h \
        Translator.h \
        Timeout.cpp \
@@ -88,6 +106,7 @@ liblyxsupport_la_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
+       weighted_btree.h \
        minizip/crypt.h \
        minizip/ioapi.c \
        minizip/ioapi.h \
@@ -99,6 +118,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 += \
@@ -111,29 +140,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 \
@@ -141,5 +169,5 @@ check_lstrings_SOURCES = \
 
 makeregfiles: ${check_PROGRAMS}
        for all in ${check_PROGRAMS} ; do \
-               ./$$all > ${srcdir}/regfiles/$$all ; \
+               ./$$all > ${srcdir}/tests/regfiles/$$all ; \
        done