anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19423 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-08-11 09:36:14 +00:00
parent 15b104953a
commit 12b09d5251
5 changed files with 42 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -421,7 +421,6 @@ AC_CONFIG_FILES([Makefile
src/support/Makefile \ src/support/Makefile \
src/frontends/Makefile \ src/frontends/Makefile \
src/frontends/controllers/Makefile \ src/frontends/controllers/Makefile \
src/frontends/controllers/tests/Makefile \
src/frontends/qt4/Makefile \ src/frontends/qt4/Makefile \
]) ])

23
src/frontends/controllers/Makefile.am
View File

@ -1,7 +1,5 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
SUBDIRS = tests
EXTRA_DIST = pch.h BCView.tmpl EXTRA_DIST = pch.h BCView.tmpl
BUILT_SOURCES = $(PCH_FILE) BUILT_SOURCES = $(PCH_FILE)
@ -95,3 +93,24 @@ liblyxcontrollers_la_SOURCES= \
ControlWrap.h \ ControlWrap.h \
frontend_helpers.cpp \ frontend_helpers.cpp \
frontend_helpers.h 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

21
src/frontends/controllers/pch.h
View File

@ -1,16 +1,37 @@
#include <config.h> #include <config.h>
#include <boost/assert.hpp>
#include <boost/crc.hpp>
#include <boost/cregex.hpp> #include <boost/cregex.hpp>
// #include <boost/format.hpp> // mult def symbols problem (_1,_2 etc)
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_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 <boost/utility.hpp>
#include <algorithm> #include <algorithm>
#include <cerrno>
#include <csignal>
#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <ctime>
#include <deque>
#include <fstream> #include <fstream>
#include <functional>
#include <iosfwd> #include <iosfwd>
#include <iostream>
#include <istream>
#include <iterator>
#include <list> #include <list>
#include <map> #include <map>
#include <ostream>
#include <queue>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <utility> #include <utility>

23
src/frontends/controllers/tests/Makefile.am
View File

@ -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

63
src/frontends/controllers/tests/pch.h
View File

@ -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>