Revert qprocess code. Revisions reverted: 22026, 22030, 22044, 22048,

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index fdf1f7c8eab2d81b5e35f9ff4932b830d1b90988..3e69f53f008bb50ac22ab11e069a158c6dabf52f 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -5,7 +5,7 @@ CLEANFILES += $(BUILT_SOURCES)
 EXTRA_DIST = pch.h \
        os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
 
-pkglib_LTLIBRARIES = liblyxsupport.la
+noinst_LTLIBRARIES = liblyxsupport.la
 
 liblyxsupport_la_LIBADD = $(LIBSHLWAPI) $(QT4_CORE_LIB) $(BOOST_SIGNALS)
 liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
@@ -24,13 +24,12 @@ liblyxsupport_la_SOURCES = \
        FileMonitor.cpp \
        RandomAccessList.h \
        abort.cpp \
-       chdir.cpp \
        convert.cpp \
        convert.h \
        copy.cpp \
        copied_ptr.h \
-       cow_ptr.h \
-       debugstream.h \
+       debug.cpp \
+       debug.h \
        docstream.cpp \
        docstream.h \
        docstring.cpp \
@@ -44,14 +43,10 @@ liblyxsupport_la_SOURCES = \
        FileName.h \
        filetools.cpp \
        filetools.h \
-       Forkedcall.cpp \
-       Forkedcall.h \
-       ForkedCallQueue.cpp \
-       ForkedCallQueue.h \
-       ForkedcallsController.cpp \
-       ForkedcallsController.h \
-       fs_extras.cpp \
-       fs_extras.h \
+       ForkedCalls.cpp \
+       ForkedCalls.h \
+       gettext.cpp \
+       gettext.h \
        getcwd.cpp \
        gzstream.cpp \
        gzstream.h \
@@ -61,10 +56,11 @@ liblyxsupport_la_SOURCES = \
        lstrings.h \
        lyxalgo.h \
        lyxlib.h \
-       lyxmanip.h \
        lyxtime.cpp \
        lyxtime.h \
        lyxsum.cpp \
+       Messages.cpp \
+       Messages.h \
        mkdir.cpp \
        os.cpp \
        os.h \
@@ -72,17 +68,17 @@ liblyxsupport_la_SOURCES = \
        Path.h \
        Package.cpp \
        Package.h \
-       qstring_helpers.cpp \
        qstring_helpers.h \
        rename.cpp \
        socktools.cpp \
        socktools.h \
-       std_istream.h \
-       std_ostream.h \
+       strfwd.h \
        Systemcall.cpp \
        Systemcall.h \
+       SignalSlot.cpp \
+       SignalSlot.h \
+       SignalSlotPrivate.h \
        tempname.cpp \
-       textutils.cpp \
        textutils.h \
        Translator.h \
        Timeout.cpp \
@@ -92,7 +88,6 @@ liblyxsupport_la_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
-       unlink.cpp \
        minizip/crypt.h \
        minizip/ioapi.c \
        minizip/ioapi.h \
@@ -106,8 +101,14 @@ liblyxsupport_la_SOURCES = \
 
 ############################## Tests ##################################
 
-EXTRA_DIST += tests/test_convert tests/test_filetools \
-       tests/test_lstrings tests/regfiles
+EXTRA_DIST += \
+       tests/test_convert \
+       tests/test_filetools \
+       tests/test_lstrings \
+       tests/regfiles/convert \
+       tests/regfiles/filetools \
+       tests/regfiles/lstrings
+
 
 TESTS = \
        test_convert \
@@ -120,7 +121,7 @@ check_PROGRAMS = \
        check_lstrings
 
 check_convert_LDADD = ../debug.o convert.o docstring.o lstrings.o unicode.o \
-       qstring_helpers.o $(BOOST_LIBS) $(QT4_CORE_LIB)
+       $(BOOST_LIBS) $(QT4_CORE_LIB)
 check_convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_convert_SOURCES = \
        tests/check_convert.cpp \
@@ -132,7 +133,7 @@ check_filetools_SOURCES = \
        tests/boost.cpp
 
 check_lstrings_LDADD = ../debug.o lstrings.o convert.o docstring.o unicode.o \
-       qstring_helpers.o $(QT4_CORE_LIB)
+       $(QT4_CORE_LIB)
 check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_lstrings_SOURCES = \
        tests/check_lstrings.cpp \