merge controllers/Makefile.am and controllers/tests/Makefile.am

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

diff --git a/configure.ac b/configure.ac
index 863b7d118bc43c58cbab7e249c5facd0964e609b..135ff8537e5b8cf31799d3b4f9e0bfd2285146c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -421,7 +421,6 @@ AC_CONFIG_FILES([Makefile
        src/support/Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
-       src/frontends/controllers/tests/Makefile \
        src/frontends/qt4/Makefile \
 ])
 

diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am
index 5d3c1f8e90d65d585b4cb4917636386a56d7ffc3..ebb42d13f0679a64bcea4ce339b18e1594aa9e4f 100644 (file)
--- a/src/frontends/controllers/Makefile.am
+++ b/src/frontends/controllers/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/config/common.am
 
-SUBDIRS = tests
-
 EXTRA_DIST = pch.h BCView.tmpl
 
 BUILT_SOURCES = $(PCH_FILE)
@@ -95,3 +93,24 @@ liblyxcontrollers_la_SOURCES= \
        ControlWrap.h \
        frontend_helpers.cpp \
        frontend_helpers.h
+
+
+################################# Tests ################################
+
+EXTRA_DIST += test_biblio
+
+TESTS = \
+       test_biblio
+
+check_PROGRAMS = \
+       biblio
+
+biblio_LDADD = $(BOOST_REGEX)
+biblio_SOURCES = \
+       tests/biblio.cpp \
+       tests/boost.cpp
+
+makeregfiles: ${check_PROGRAMS}
+       for all in ${check_PROGRAMS} ; do \
+               ./$$all > ${srcdir}/regfiles/$$all ; \
+       done

diff --git a/src/frontends/controllers/pch.h b/src/frontends/controllers/pch.h
index 49a312c9c9ede274603470031491fbd31a85428b..a30e8b8bd1b47c5b47e74d73862444de034c507e 100644 (file)
--- a/src/frontends/controllers/pch.h
+++ b/src/frontends/controllers/pch.h
@@ -1,16 +1,37 @@
 #include <config.h>
 
+#include <boost/assert.hpp>
+#include <boost/crc.hpp>
 #include <boost/cregex.hpp>
+// #include <boost/format.hpp> // mult def symbols problem (_1,_2 etc)
 #include <boost/regex.hpp>
+#include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/signal.hpp>
+#include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#include <boost/tokenizer.hpp>
 #include <boost/utility.hpp>
 
 #include <algorithm>
+#include <cerrno>
+#include <csignal>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <deque>
 #include <fstream>
+#include <functional>
 #include <iosfwd>
+#include <iostream>
+#include <istream>
+#include <iterator>
 #include <list>
 #include <map>
+#include <ostream>
+#include <queue>
 #include <sstream>
 #include <string>
 #include <utility>

diff --git a/src/frontends/controllers/tests/Makefile.am b/src/frontends/controllers/tests/Makefile.am
deleted file mode 100644 (file)
index ca1649b..0000000
--- a/src/frontends/controllers/tests/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-include $(top_srcdir)/config/common.am
-
-EXTRA_DIST = pch.h test_biblio
-
-BUILT_SOURCES = $(PCH_FILE)
-
-TESTS = \
-       test_biblio
-
-check_PROGRAMS = \
-       biblio
-
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-
-biblio_LDADD = $(BOOST_REGEX)
-biblio_SOURCES = \
-       biblio.cpp \
-       boost.cpp
-
-makeregfiles: ${check_PROGRAMS}
-       for all in ${check_PROGRAMS} ; do \
-               ./$$all > ${srcdir}/regfiles/$$all ; \
-       done

diff --git a/src/frontends/controllers/tests/pch.h b/src/frontends/controllers/tests/pch.h
deleted file mode 100644 (file)
index b6603e8..0000000
--- a/src/frontends/controllers/tests/pch.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-#include <config.h>
-
-#include <boost/assert.hpp>
-#include <boost/crc.hpp>
-// #include <boost/format.hpp> // mult def symbols problem (_1,_2 etc)
-#include <boost/regex.hpp>
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/signal.hpp>
-#include <boost/signals/trackable.hpp>
-#include <boost/version.hpp>
-
-#if BOOST_VERSION < 103300
-# include <boost/test/detail/nullstream.hpp>
-#else
-# include <boost/test/utils/nullstream.hpp>
-#endif
-
-#include <boost/tokenizer.hpp>
-#include <boost/utility.hpp>
-
-#include <fcntl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <time.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifndef _WIN32
-# include <sys/un.h>
-# include <sys/wait.h>
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-#endif
-
-#include <algorithm>
-#include <cerrno>
-#include <csignal>
-#include <cstddef>
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
-#include <deque>
-#include <fstream>
-#include <functional>
-#include <iostream>
-#include <istream>
-#include <iterator>
-#include <list>
-#include <map>
-#include <ostream>
-#include <queue>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>