merge support/Makefile.am and support/tests/Makefile.am

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19422 a592a061-630c-0410-9148-cb99ea01b6c8

configure.ac

@@ -419,7 +419,6 @@ AC_CONFIG_FILES([Makefile
        src/graphics/Makefile \
        src/insets/Makefile \
        src/support/Makefile \
-       src/support/tests/Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/controllers/tests/Makefile \

src/support/Makefile.am

@@ -1,7 +1,5 @@
 include $(top_srcdir)/config/common.am
 
-SUBDIRS = . tests
-
 CLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST = Package.cpp.in pch.h \
@@ -107,3 +105,42 @@ s,@PROGRAM_SUFFIX@,$(program_suffix)," \
 		rm -f package.C ;\
 		mv tmp_package package.C ;\
 	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

src/support/tests/Makefile.am

@@ -1,40 +0,0 @@
-include $(top_srcdir)/config/common.am
-
-EXTRA_DIST = pch.h test_convert test_filetools test_lstrings regfiles
-
-BUILT_SOURCES = $(PCH_FILE)
-
-TESTS = \
-	test_convert \
-	test_filetools \
-	test_lstrings
-
-check_PROGRAMS = \
-	convert \
-	filetools \
-	lstrings
-
-AM_CPPFLAGS += $(BOOST_INCLUDES) -I$(srcdir)/../..
-
-
-convert_LDADD = ../../debug.o ../convert.o ../docstring.o ../lstrings.o ../unicode.o ../qstring_helpers.o $(BOOST_REGEX) $(QT4_CORE_LIB)
-convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
-convert_SOURCES = \
-	convert.cpp \
-	boost.cpp
-
-filetools_LDADD = ../../debug.o ../libsupport.la $(BOOST_REGEX) $(BOOST_FILESYSTEM)
-filetools_SOURCES = \
-	filetools.cpp \
-	boost.cpp
-
-lstrings_LDADD = ../../debug.o ../lstrings.o ../convert.o ../docstring.o ../unicode.o ../qstring_helpers.o $(QT4_CORE_LIB)
-lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
-lstrings_SOURCES = \
-	lstrings.cpp \
-	boost.cpp
-
-makeregfiles: ${check_PROGRAMS}
-	for all in ${check_PROGRAMS} ; do \
-		./$$all > ${srcdir}/regfiles/$$all ; \
-	done

src/support/tests/test_convert

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 regfile=`cat ${srcdir}/regfiles/convert`
-output=`./convert`
+output=`./check_convert`
 
 test "$regfile" = "$output"
 exit $?

src/support/tests/test_filetools

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 regfile=`cat ${srcdir}/regfiles/filetools`
-output=`./filetools`
+output=`./check_filetools`
 
 test "$regfile" = "$output"
 exit $?

src/support/tests/test_lstrings

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 regfile=`cat ${srcdir}/regfiles/lstrings`
-output=`./lstrings`
+output=`./check_lstrings`
 
 test "$regfile" = "$output"
 exit $?