move stuff around. probably not the final destination...

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

src/frontends/Dialogs.cpp

@@ -13,7 +13,7 @@
 #include <config.h>
 
 #include "Dialogs.h"
-#include "controllers/Dialog.h"
+#include "Dialog.h"
 
 #include <boost/signal.hpp>
 #include <boost/bind.hpp>

src/frontends/Makefile.am

@@ -1,8 +1,8 @@
 include $(top_srcdir)/config/common.am
 
-SUBDIRS = controllers $(FRONTENDS_SUBDIRS)
+SUBDIRS = $(FRONTENDS_SUBDIRS)
 
-DIST_SUBDIRS = controllers qt4
+DIST_SUBDIRS = qt4
 
 EXTRA_DIST = pch.h
 
@@ -13,6 +13,12 @@ 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 \

src/frontends/controllers/Makefile.am

@@ -6,15 +6,9 @@ EXTRA_DIST = tests/regfiles/biblio
 
 noinst_LTLIBRARIES = liblyxcontrollers.la
 
-SOURCEFILES = \
-	Dialog.cpp \
-	ButtonPolicy.cpp \
-	frontend_helpers.cpp 
+SOURCEFILES = 
 
-HEADERFILES = \
-	Dialog.h \
-	ButtonPolicy.h \
-	frontend_helpers.h
+HEADERFILES =
 
 if MONOLITHIC_CONTROLLERS
 

src/frontends/qt4/GuiBibitem.h

@@ -16,8 +16,6 @@
 #include "GuiDialog.h"
 #include "ui_BibitemUi.h"
 
-#include "controllers/Dialog.h"
-
 #include "insets/InsetCommandParams.h"
 
 namespace lyx {