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 417e20efb11995e335cc3adf466a6294d0d6c221..86c5f4d7f2909a8ca728a2b6c2c3c5f3adfb26b6 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -41,6 +41,8 @@ liblyxsupport_la_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
+       assert.h \
+       assert.cpp \
        convert.cpp \
        convert.h \
        copied_ptr.h \
@@ -57,8 +59,11 @@ 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 \
@@ -101,6 +106,7 @@ liblyxsupport_la_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
+       weighted_btree.h \
        minizip/crypt.h \
        minizip/ioapi.c \
        minizip/ioapi.h \
@@ -134,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 \
@@ -164,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