anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make qt2 compile (linking is another matter)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3952 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-04-08 17:55:47 +00:00
parent 2099c3cc2b
commit 615cc9ec4a
8 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/ChangeLog
View File

@ -4,7 +4,7 @@
(EXTRA_DIST): delete
(dist-hook): delete
(distclean-local): delete
2002-04-06 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am: make distcheck work

14
src/frontends/qt2/ChangeLog
View File

@ -1,6 +1,18 @@
2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* 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

4
src/frontends/qt2/Makefile.am
View File

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

4
src/frontends/qt2/Makefile.dialogs
View File

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

5
src/frontends/qt2/moc/Makefile.am
View File

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

2
src/frontends/qt2/ui/Makefile.am
View File

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

5
src/frontends/qt2/ui/moc/Makefile.am
View File

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

4
src/frontends/qt2/xforms/Makefile.am
View File

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