The big renaming. Yowser.

[features.git] / src / frontends / qt2 / Makefile.am

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 52700356f1474cf15a35cd8800e9f1f652ff714d..f0ad5edcb4cf6c61c8043c255d4b5e0096e1a510 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -3,45 +3,30 @@ DISTCLEANFILES= *.orig *.rej *~ *.bak core
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 noinst_LTLIBRARIES = libqt2.la
 BOOST_INCLUDES = -I$(top_srcdir)/boost
+SUBDIRS=ui moc
 INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
        ${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
-DEFINES += -DQT_CLEAN_NAMESPACE
+CXXFLAGS += -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
-# moc generated files
-BUILTSOURCES = \
-       moc_FileDialog_private.C \
-       moc_Qt2Base.C           \
-       moc_FormCitationDialog.C        \
-       moc_FormCitationDialogImpl.C    \
-       moc_FormCopyrightDialog.C       \
-       moc_FormCopyrightDialogImpl.C   \
-       moc_FormCreditsDialog.C \
-       moc_FormCreditsDialogImpl.C     \
-              moc_chardlg.C \
-              moc_chardlgimpl.C \
-              moc_paragraphdlg.C \
-              moc_paragraphdlgimpl.C \
-              moc_printdlg.C \
-              moc_printdlgimpl.C \
-              moc_searchdlg.C \
-              moc_searchdlgimpl.C \
-              moc_tabularcreatedlg.C \
-              moc_tabularcreatedlgimpl.C \
-              moc_emptytable.C
-
-LYXDATADIRS = dlg
 DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
 
+include Makefile.dialogs
+
+libqt2_la_DEPENDENCIES = ui/libqt2ui.la moc/libqt2moc.la
+ 
 libqt2_la_OBJADD = \
+       ui/libqt2ui.la \
+       moc/libqt2moc.la \
        ../controllers/ButtonControllerBase.lo \
        ../xforms/combox.lo \
        ../xforms/Color.lo \
+       ../xforms/FloatMenuImpl.lo \
        ../xforms/FormBaseDeprecated.lo \
        ../xforms/FormBibitem.lo \
        ../xforms/FormBibtex.lo \
        ../xforms/FormBrowser.lo \
-       ../xforms/FormDocument.lo       \
+       ../xforms/FormDocument.lo \
        ../xforms/FormError.lo \
        ../xforms/FormExternal.lo \
        ../xforms/FormGraphics.lo \
@@ -66,7 +51,6 @@ libqt2_la_OBJADD = \
        ../xforms/form_bibitem.lo \
        ../xforms/form_bibtex.lo \
        ../xforms/form_browser.lo \
-       ../xforms/form_credits.lo \
        ../xforms/form_document.lo \
        ../xforms/form_error.lo \
        ../xforms/form_external.lo \
@@ -90,131 +74,14 @@ LDFLAGS= $(libqt2_la_OBJADD)
 ETAGS_ARGS = --lang=c++
 
 libqt2_la_SOURCES = \
-       $(BUILTSOURCES) \
+       $(DIALOGSOURCES) \
        Dialogs.C \
        GUIRunTime.C \
-       FormCharacter.C \
-       FormCharacter.h \
-       chardlg.C \
-       chardlg.h \
-       chardlgimpl.C \
-       chardlgimpl.h \
        FileDialog.C \
        FileDialog_private.C \
        Qt2Base.C       \
        Qt2Base.h       \
-       FormCitation.C  \
-       FormCitation.h  \
-       FormCitationDialog.C    \
-       FormCitationDialog.h    \
-       FormCitationDialogImpl.C        \
-       FormCitationDialogImpl.h        \
-       FormCopyright.C \
-       FormCopyright.h \
-       FormCopyrightDialog.C   \
-       FormCopyrightDialog.h   \
-       FormCopyrightDialogImpl.C       \
-       FormCopyrightDialogImpl.h       \
-       FormCredits.C   \
-       FormCredits.h   \
-       FormCreditsDialog.C     \
-       FormCreditsDialog.h     \
-       FormCreditsDialogImpl.C \
-       FormCreditsDialogImpl.h \
-       FormParagraph.C \
-       FormParagraph.h \
-       paragraphdlg.C \
-       paragraphdlg.h \
-       paragraphdlgimpl.C \
-       paragraphdlgimpl.h \
-       FormPrint.C     \
-       FormPrint.h     \
-       printdlg.C \
-       printdlg.h \
-       printdlgimpl.C \
-       printdlgimpl.h \
        emptytable.C \
        emptytable.h \
-       FormSearch.C    \
-       FormSearch.h    \
-       searchdlg.C \
-       searchdlg.h \
-       searchdlgimpl.C \
-       searchdlgimpl.h \
-       FormSplash.C    \
-       FormSplash.h    \
-       FormSplashImpl.C        \
-       FormSplashImpl.h        \
-       FormTabularCreate.C \
-       FormTabularCreate.h \
-       tabularcreatedlg.C \
-       tabularcreatedlg.h \
-       tabularcreatedlgimpl.C \
-       tabularcreatedlgimpl.h  \
        qt2BC.C \
        qt2BC.h 
-
-# just copied from old lyx repository
-dist-hook:
-       for subdir in $(LYXDATADIRS) ; do \
-       test -d $(distdir)/$$subdir \
-       || mkdir $(distdir)/$$subdir \
-       || exit 1; \
-       chmod 777 $(distdir)/$$subdir; \
-       list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \
-       echo $$list ; \
-       for fil in $$list ; do \
-       cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \
-       done ; \
-       done
-
-moc_%.C: %.h
-       $(MOC) -o $@ $<
-
-FormCitation.C: FormCitationDialog.h
-FormCitationDialog.h: FormCitationDialog.ui
-       $(UIC) -o $@ $<
-FormCitationDialog.C: FormCitationDialog.ui
-       $(UIC) -impl FormCitationDialog.h -o $@ $<
-
-FormCopyright.C: FormCopyrightDialogImpl.h
-FormCopyrightDialog.h: FormCopyrightDialog.ui
-       $(UIC) -o $@ $<
-FormCopyrightDialog.C: FormCopyrightDialog.ui
-       $(UIC) -impl FormCopyrightDialog.h -o $@ $<
-
-FormCredits.C: FormCreditsDialogImpl.h
-FormCreditsDialog.h: FormCreditsDialog.ui
-       $(UIC) -o $@ $<
-FormCreditsDialog.C: FormCreditsDialog.ui
-       $(UIC) -impl FormCreditsDialog.h -o $@ $<
-
-FormParagraph.C: paragraphdlg.h
-paragraphdlg.h: paragraphdlg.ui
-       $(UIC) -o $@ $<
-paragraphdlg.C: paragraphdlg.ui
-       $(UIC) -impl paragraphdlg.h -o $@ $<
-
-FormPrint.C: printdlg.h
-printdlg.h: printdlg.ui
-       $(UIC) -o $@ $<
-printdlg.C: printdlg.ui
-       $(UIC) -impl printdlg.h -o $@ $<
-
-FormTabularCreate.C: tabularcreatedlg.h
-tabularcreatedlg.h: tabularcreatedlg.ui
-       $(UIC) -o $@ $<
-tabularcreatedlg.C: tabularcreatedlg.ui
-       $(UIC) -impl tabularcreatedlg.h -o $@ $<
-
-FormCharacter.C: chardlg.h
-chardlg.h: chardlg.ui
-       $(UIC) -o $@ $<
-chardlg.C: chardlg.ui
-       $(UIC) -impl chardlg.h -o $@ $<
-
-FormSearch.C: searchdlg.h
-searchdlg.h: searchdlg.ui
-       $(UIC) -o $@ $<
-searchdlg.C: searchdlg.ui
-       $(UIC) -impl searchdlg.h -o $@ $<