delete controllers dir

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20830 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-10-07 21:38:06 +00:00
parent 8500da8691
commit 72344cfbe6
8 changed files with 15 additions and 69 deletions

View File

@ -414,12 +414,6 @@ AC_ARG_ENABLE(monolithic-client,
[enable_monolithic_client=no])
AM_CONDITIONAL(MONOLITHIC_CLIENT, test "$enable_monolithic_client" = "yes")
AC_ARG_ENABLE(monolithic-controllers,
AC_HELP_STRING([--enable-monolithic-controllers],
[Use monolithic controllers compilations]),,
[enable_monolithic_controllers=no])
AM_CONDITIONAL(MONOLITHIC_CONTROLLERS, test "$enable_monolithic_controllers" = "yes")
AC_ARG_ENABLE(monolithic-insets,
AC_HELP_STRING([--enable-monolithic-insets],
[Use monolithic insets compilations]),,
@ -493,7 +487,6 @@ AC_CONFIG_FILES([Makefile
src/tex2lyx/Makefile \
src/support/Makefile \
src/frontends/Makefile \
src/frontends/controllers/Makefile \
src/frontends/qt4/Makefile
])
@ -511,7 +504,6 @@ if test x$with_qmake = xyes ; then
rm src/tex2lyx/Makefile
rm src/support/Makefile
rm src/frontends/Makefile
rm src/frontends/controllers/Makefile
rm src/frontends/qt4/Makefile
rm -rf boost/.deps
rm -rf src/client/.deps
@ -519,7 +511,6 @@ if test x$with_qmake = xyes ; then
rm -rf src/tex2lyx/.deps
rm -rf src/support/.deps
rm -rf src/frontends/.deps
rm -rf src/frontends/controllers/.deps
rm -rf src/frontends/qt4/.deps
${srcdir}/development/qmake/doit
fi

View File

@ -13,6 +13,7 @@ inc="$inc -I../../src/frontends/controllers"
inc="$inc -I../../src/frontends/qt4"
s=0
#for i in `find ../../src/frontends/controllers -name *.cpp` ; do
for i in `find ../.. -name *.cpp` ; do
#echo $i
#echo "g++ $inc -DQT_NO_STL -E $i"

View File

@ -713,16 +713,10 @@ src_frontends_extra_files = Split('''
src_frontends_controllers_header_files = Split('''
ButtonPolicy.h
Dialog.h
frontend_helpers.h
''')
src_frontends_controllers_files = Split('''
ButtonPolicy.cpp
Dialog.cpp
frontend_helpers.cpp
''')
@ -747,6 +741,9 @@ src_frontends_controllers_tests_regfiles_extra_files = Split('''
src_frontends_qt4_header_files = Split('''
../ButtonPolicy.h
../Dialog.h
../frontend_helpers.h
Action.h
BulletsModule.h
ButtonController.h
@ -834,6 +831,9 @@ src_frontends_qt4_header_files = Split('''
src_frontends_qt4_files = Split('''
../ButtonPolicy.cpp
../Dialog.cpp
../frontend_helpers.cpp
Action.cpp
BulletsModule.cpp
ButtonController.cpp

View File

@ -29,7 +29,6 @@ lyx_LDADD = \
liblyxinsets.la \
frontends/liblyxfrontends.la \
frontends/qt4/liblyxqt4.la \
frontends/controllers/liblyxcontrollers.la \
liblyxgraphics.la \
support/liblyxsupport.la \
$(OTHERLIBS) \

View File

@ -1,8 +1,8 @@
include $(top_srcdir)/config/common.am
SUBDIRS = $(FRONTENDS_SUBDIRS)
SUBDIRS = $(FRONTENDS_SUBDIRS) .
DIST_SUBDIRS = qt4
DIST_SUBDIRS = qt4 .
EXTRA_DIST = pch.h
@ -13,12 +13,6 @@ noinst_LTLIBRARIES = liblyxfrontends.la
AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
liblyxfrontends_la_SOURCES = \
ButtonPolicy.cpp \
ButtonPolicy.h \
Dialog.cpp \
Dialog.h \
frontend_helpers.cpp \
frontend_helpers.h \
alert.cpp \
alert.h \
Alert_pimpl.h \

View File

@ -1,30 +0,0 @@
include $(top_srcdir)/config/common.am
AM_CPPFLAGS += -I$(top_srcdir)/src $(BOOST_INCLUDES) -I$(top_srcdir)/src/frontends
EXTRA_DIST = tests/regfiles/biblio
noinst_LTLIBRARIES = liblyxcontrollers.la
SOURCEFILES =
HEADERFILES =
if MONOLITHIC_CONTROLLERS
lyxcontrollers.cpp:
@echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
BUILT_SOURCES = lyxcontrollers.cpp
liblyxcontrollers_la_SOURCES = lyxcontrollers.cpp $(HEADERFILES)
else
EXTRA_DIST += pch.h
BUILT_SOURCES = $(PCH_FILE)
AM_CPPFLAGS += $(PCH_FLAGS)
liblyxcontrollers_la_SOURCES = $(SOURCEFILES) $(HEADERFILES)
endif

View File

@ -1,15 +0,0 @@
#include <config.h>
#include <algorithm>
#include <fstream>
#include <iosfwd>
#include <iostream>
#include <istream>
#include <iterator>
#include <list>
#include <map>
#include <ostream>
#include <sstream>
#include <string>
#include <utility>
#include <vector>

View File

@ -46,6 +46,12 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/src/frontends/controllers
SOURCEFILES = \
../ButtonPolicy.cpp \
../ButtonPolicy.h \
../Dialog.cpp \
../Dialog.h \
../frontend_helpers.cpp \
../frontend_helpers.h \
Resources.cpp \
Action.cpp \
alert_pimpl.cpp \