From 615cc9ec4abb02cee89f064e6b85999fcd182706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 8 Apr 2002 17:55:47 +0000 Subject: [PATCH] make qt2 compile (linking is another matter) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3952 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/ChangeLog | 2 +- src/frontends/qt2/ChangeLog | 14 +++++++++++++- src/frontends/qt2/Makefile.am | 4 +++- src/frontends/qt2/Makefile.dialogs | 4 ---- src/frontends/qt2/moc/Makefile.am | 5 ++--- src/frontends/qt2/ui/Makefile.am | 2 +- src/frontends/qt2/ui/moc/Makefile.am | 5 ++--- src/frontends/qt2/xforms/Makefile.am | 4 ++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index a6e520549a..81f8af38a8 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -4,7 +4,7 @@ (EXTRA_DIST): delete (dist-hook): delete (distclean-local): delete - + 2002-04-06 Lars Gullik Bjønnes * Makefile.am: make distcheck work diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 37c9c1c2d7..e679a534be 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,6 +1,18 @@ 2002-04-08 Lars Gullik Bjønnes - * xforms/Makefile.am (EXTRA_DIST): delete + * xforms/Makefile.am (link_files): use correct _SOURCES variable. + + * ui/moc/Makefile.am: move include to top + (DISTCLEANFILES): take the UIMOCDIALOGS variable instead + + * ui/Makefile.am: ws change + + * moc/Makefile.am: move include to top + + * Makefile.am (EXTRA_DIST): some file taken from... + * Makefile.dialogs (DIALOGSOURCES):here + + * xforms/Makefile.am (EXTRA_DIST): delete (libqt2xforms_la_SOURCES): change to... (nodist_libqt2xforms_la_SOURCES): this diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am index 1faf104a6d..ef1a64a021 100644 --- a/src/frontends/qt2/Makefile.am +++ b/src/frontends/qt2/Makefile.am @@ -2,7 +2,9 @@ include $(top_srcdir)/config/common.am SUBDIRS = xforms ui moc -EXTRA_DIST = Makefile.dialogs +EXTRA_DIST = Makefile.dialogs QDocument.C QDocument.h \ + QDocumentDialog.C QDocumentDialog.h QParagraph.h QParagraph.C \ + QParagraphDialog.h QParagraphDialog.C noinst_LTLIBRARIES = libqt2.la diff --git a/src/frontends/qt2/Makefile.dialogs b/src/frontends/qt2/Makefile.dialogs index 7a5b841df4..2568f64ac6 100644 --- a/src/frontends/qt2/Makefile.dialogs +++ b/src/frontends/qt2/Makefile.dialogs @@ -40,8 +40,6 @@ DIALOGSOURCES = \ QCharacter.C QCharacterDialog.C \ QCitation.h QCitationDialog.h \ QCitation.C QCitationDialog.C \ - QDocument.C QDocument.h \ - QDocumentDialog.C QDocumentDialog.h \ QError.h QErrorDialog.h \ QError.C QErrorDialog.C \ QERT.h QERTDialog.h \ @@ -60,8 +58,6 @@ DIALOGSOURCES = \ QLog.C QLogDialog.C \ QMinipage.h QMinipageDialog.h \ QMinipage.C QMinipageDialog.C \ - QParagraph.C QParagraph.h \ - QParagraphDialog.C QParagraphDialog.h \ QPreamble.h QPreambleDialog.h \ QPreamble.C QPreambleDialog.C \ QPrint.h QPrintDialog.h \ diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am index 820f685ff0..d976266fd6 100644 --- a/src/frontends/qt2/moc/Makefile.am +++ b/src/frontends/qt2/moc/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/config/common.am +include $(srcdir)/../Makefile.dialogs -DISTCLEANFILES += $(libqt2moc_la_SOURCES) +DISTCLEANFILES += $(MOCDIALOGS) noinst_LTLIBRARIES = libqt2moc.la @@ -14,8 +15,6 @@ INCLUDES = -I$(top_srcdir)/src/ \ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -include $(srcdir)/../Makefile.dialogs - #libqt2moc_la_SOURCES = FileDialog_private_moc.C \ # emptytable_moc.C \ # lengthcombo_moc.C \ diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am index d06fad89d8..58b6056616 100644 --- a/src/frontends/qt2/ui/Makefile.am +++ b/src/frontends/qt2/ui/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -SUBDIRS =. moc +SUBDIRS = . moc include $(srcdir)/../Makefile.dialogs diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am index 5b649922ee..f7ad2f696b 100644 --- a/src/frontends/qt2/ui/moc/Makefile.am +++ b/src/frontends/qt2/ui/moc/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/config/common.am +include $(srcdir)/../../Makefile.dialogs -DISTCLEANFILES += $(libqt2uimoc_la_SOURCES) +DISTCLEANFILES += $(UIMOCDIALOGS) noinst_LTLIBRARIES = libqt2uimoc.la @@ -13,8 +14,6 @@ INCLUDES = -I$(top_srcdir)/src/ \ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -include $(srcdir)/../../Makefile.dialogs - nodist_libqt2uimoc_la_SOURCES = $(UIMOCDIALOGS) libqt2uimoc.la: $(libqt2uimoc_la_OBJECTS) $(libqt2uimoc_la_DEPENDENCIES) diff --git a/src/frontends/qt2/xforms/Makefile.am b/src/frontends/qt2/xforms/Makefile.am index 40b385bdee..426ab94096 100644 --- a/src/frontends/qt2/xforms/Makefile.am +++ b/src/frontends/qt2/xforms/Makefile.am @@ -89,6 +89,6 @@ nodist_libqt2xforms_la_SOURCES = \ libqt2xforms.la: link_files $(libqt2xforms_la_OBJECTS) link_files: - for i in $(libqt2xforms_la_SOURCES); do \ + for i in $(nodist_libqt2xforms_la_SOURCES); do \ ln -sf "$(top_srcdir)/src/frontends/xforms/$$i" . ; \ - done + done