fix warning on possibly(?) unused precompiled headers due to different -fPic settings...

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 2b1e3d04759e34c181e3f7a9a720b8ed3d719b32..2e6fc5aa0bc376ba5b700f3ca4c5c44706e5eea4 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,23 +1,21 @@
 include $(top_srcdir)/config/common.am
 
-SUBDIRS = . tests
-
 CLEANFILES += $(BUILT_SOURCES)
 
-EXTRA_DIST = Package.C.in pch.h \
+EXTRA_DIST = Package.cpp.in pch.h \
        os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
 
-noinst_LTLIBRARIES = libsupport.la
+pkglib_LTLIBRARIES = liblyxsupport.la
 
-libsupport_la_LIBADD = $(LIBSHLWAPI) $(QT4_CORE_LIB)
-libsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
+liblyxsupport_la_LIBADD = $(LIBSHLWAPI) $(QT4_CORE_LIB) $(BOOST_SIGNALS)
+liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
 
-BUILT_SOURCES = $(PCH_FILE) package.C
+BUILT_SOURCES = $(PCH_FILE) Package.cpp
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
-libsupport_la_SOURCES = \
+liblyxsupport_la_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
@@ -51,6 +49,8 @@ libsupport_la_SOURCES = \
        fs_extras.cpp \
        fs_extras.h \
        getcwd.cpp \
+       gzstream.cpp \
+       gzstream.h \
        kill.cpp \
        limited_stack.h \
        lstrings.cpp \
@@ -66,7 +66,7 @@ libsupport_la_SOURCES = \
        os.h \
        Path.cpp \
        Path.h \
-       package.C \
+       Package.cpp \
        Package.h \
        qstring_helpers.cpp \
        qstring_helpers.h \
@@ -81,6 +81,8 @@ libsupport_la_SOURCES = \
        textutils.cpp \
        textutils.h \
        Translator.h \
+       Timeout.cpp \
+       Timeout.h \
        types.h \
        userinfo.cpp \
        userinfo.h \
@@ -89,19 +91,58 @@ libsupport_la_SOURCES = \
        unlink.cpp
 
 
-package.C: build_package
+Package.cpp: build_package
 
 # Solaris sed does not like spaces bewteen the ;-delimited commands
-build_package: Package.C.in
+build_package: Package.cpp.in
        @rm -f tmp_package ;\
        sed "s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
 s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
 s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\
 s,@PROGRAM_SUFFIX@,$(program_suffix)," \
-               $(srcdir)/Package.C.in > tmp_package ;\
-       if cmp -s tmp_package package.C ; then \
+               $(srcdir)/Package.cpp.in > tmp_package ;\
+       if cmp -s tmp_package Package.cpp ; then \
                rm -f tmp_package ;\
        else \
-               rm -f package.C ;\
-               mv tmp_package package.C ;\
+               rm -f Package.cpp ;\
+               mv tmp_package Package.cpp ;\
        fi
+
+
+############################## Tests ##################################
+
+EXTRA_DIST += test_convert test_filetools test_lstrings regfiles
+
+TESTS = \
+       test_convert \
+       test_filetools \
+       test_lstrings
+
+check_PROGRAMS = \
+       check_convert \
+       check_filetools \
+       check_lstrings
+
+check_convert_LDADD = ../debug.o convert.o docstring.o lstrings.o unicode.o \
+       qstring_helpers.o $(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_SOURCES = \
+       tests/check_filetools.cpp \
+       tests/boost.cpp
+
+check_lstrings_LDADD = ../debug.o lstrings.o convert.o docstring.o unicode.o \
+       qstring_helpers.o $(QT4_CORE_LIB)
+check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
+check_lstrings_SOURCES = \
+       tests/check_lstrings.cpp \
+       tests/boost.cpp
+
+makeregfiles: ${check_PROGRAMS}
+       for all in ${check_PROGRAMS} ; do \
+               ./$$all > ${srcdir}/regfiles/$$all ; \
+       done