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 distcheck work

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5936 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-01-12 22:24:47 +00:00
parent ff3c0dec4b
commit b379d75b45
13 changed files with 142 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/ChangeLog
View File

@ -1,3 +1,10 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* xforms.m4 (LYX_CHECK_XFORMS_IMAGE_LOADER): include forms.h in
the prog that checks for flimage.h header.
* common.am (AM_INSTALL_DATA_FLAGS): add
2003-01-09 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2003-01-09 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxinclude.m4: * lyxinclude.m4:

2
config/common.am
View File

@ -4,6 +4,8 @@ DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
ETAGS_ARGS = --lang=c++ ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost BOOST_INCLUDES = -I$(top_srcdir)/boost

2
config/xforms.m4
View File

@ -67,7 +67,7 @@ AC_LANG_SAVE
AC_LANG_C AC_LANG_C
dnl The image headers were split out of forms.h in xforms version 1.0. dnl The image headers were split out of forms.h in xforms version 1.0.
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break) AC_CHECK_HEADERS(flimage.h X11/flimage.h, break,,[#include $lyx_cv_forms_h_location])
AC_SEARCH_LIBS(flimage_dup, flimage, AC_SEARCH_LIBS(flimage_dup, flimage,
[if test "$ac_cv_search_flimage_dup" != "none required" ; then [if test "$ac_cv_search_flimage_dup" != "none required" ; then
XFORMS_IMAGE_LIB="-lflimage" XFORMS_IMAGE_LIB="-lflimage"

4
development/ChangeLog
View File

@ -1,3 +1,7 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am (EXTRA_DIST): dist generated spec file as well.
2002-10-25 Kayvan A. Sylvan <kayvan@sylvan.com> 2002-10-25 Kayvan A. Sylvan <kayvan@sylvan.com>
* lyx.spec.in (CFLAGS, CXXFLAGS): Fixed to use configure * lyx.spec.in (CFLAGS, CXXFLAGS): Fixed to use configure

2
development/Makefile.am
View File

@ -2,4 +2,4 @@ include $(top_srcdir)/config/common.am
EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \ EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \
gettext.patch lazy_lyxtext.txt lyx3 lyx.rpm.README \ gettext.patch lazy_lyxtext.txt lyx3 lyx.rpm.README \
lyxserver lyx.spec.in OS2 Seminar.txt TodoPlan-1.3 tools Win32 lyxserver lyx.spec.in lyx.spec OS2 Seminar.txt TodoPlan-1.3 tools Win32

13
src/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am (LIBS): delete var
(lyx_LDADD): add @LIBS@ here instead.
2003-01-06 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2003-01-06 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxfunc.C (getStatus): fix disabling of cut/paste of cells in a * lyxfunc.C (getStatus): fix disabling of cut/paste of cells in a
@ -16,8 +21,8 @@
2003-01-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2003-01-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* paragraph_pimpl.C (simpleTeXBlanks): * paragraph_pimpl.C (simpleTeXBlanks):
(simpleTeXSpecialChars): (simpleTeXSpecialChars):
* paragraph.C (simpleTeXOnePar): make `column' unsigned. * paragraph.C (simpleTeXOnePar): make `column' unsigned.
* tabular.C (latex): add some missing case statements. Reindent. * tabular.C (latex): add some missing case statements. Reindent.
@ -55,7 +60,7 @@
2002-12-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* text.C (insertChar): * text.C (insertChar):
* lyxrc.C (getDescription): remove extra spaces * lyxrc.C (getDescription): remove extra spaces
2002-12-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
@ -91,7 +96,7 @@
* lyxfunc.C: use LyXKeySym->isText() as last-ditch * lyxfunc.C: use LyXKeySym->isText() as last-ditch
insert. Only remove shift modifier under strict insert. Only remove shift modifier under strict
circumstances. circumstances.
2002-12-09 Lars Gullik Bjønnes <larsbj@gullik.net> 2002-12-09 Lars Gullik Bjønnes <larsbj@gullik.net>
* MenuBackend.C (expandToc): fix crash. * MenuBackend.C (expandToc): fix crash.

4
src/Makefile.am
View File

@ -6,8 +6,6 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in
SUBDIRS = mathed insets graphics support frontends SUBDIRS = mathed insets graphics support frontends
LIBS += @LIBS@
bin_PROGRAMS = lyx bin_PROGRAMS = lyx
LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \ LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
@ -19,7 +17,7 @@ BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
../boost/libs/signals/src/libboostsignals.la ../boost/libs/signals/src/libboostsignals.la
lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \ lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
$(PSPELL_LIBS) $(AIKSAURUS_LIBS) $(PSPELL_LIBS) $(AIKSAURUS_LIBS) @LIBS@
#lyx_LDFLAGS=-Wl,-O1 #lyx_LDFLAGS=-Wl,-O1

7
src/frontends/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am (LIBS): delete
(libfrontends_la_LDFLAGS): add with same as LIBS
2003-01-11 Angus Leeming <leeming@lyx.org> 2003-01-11 Angus Leeming <leeming@lyx.org>
* screen.C (SplashScreen): load up banner.ppm rather than banner.xpm. * screen.C (SplashScreen): load up banner.ppm rather than banner.xpm.
@ -14,7 +19,7 @@
2002-12-12 John Levon <levon@movementarian.org> 2002-12-12 John Levon <levon@movementarian.org>
* LyXKeySym.h: add isText() * LyXKeySym.h: add isText()
2002-12-03 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-12-03 Lars Gullik Bjønnes <larsbj@birdstep.com>
* screen.C (fitCursor): remove usleep thingie * screen.C (fitCursor): remove usleep thingie

3
src/frontends/Makefile.am
View File

@ -6,10 +6,9 @@ DIST_SUBDIRS = controllers xforms qt2 gnome
noinst_LTLIBRARIES = libfrontends.la noinst_LTLIBRARIES = libfrontends.la
LIBS += $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS)
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(BOOST_INCLUDES) INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(BOOST_INCLUDES)
libfrontends_la_LDFLAGS = $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS)
libfrontends_la_LIBADD = $(FRONTEND_GUILIB) controllers/*.lo libfrontends_la_LIBADD = $(FRONTEND_GUILIB) controllers/*.lo
libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD) libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD)

49
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* ui/Makefile.am (EXTRA_DIST): dist ui files
(SRCS): var with all ui files
2003-01-06 Michael Schmitt <Michael.Schmitt@teststep.org> 2003-01-06 Michael Schmitt <Michael.Schmitt@teststep.org>
* FileDialog.C: * FileDialog.C:
@ -17,9 +22,9 @@
* QtView.h: * QtView.h:
* QtView.C: * QtView.C:
2003-01-04 Juergen Spitzmueller <j.spitzmueller@gmx.de> 2003-01-04 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* QURL.C: isValid(): fix validation. * QURL.C: isValid(): fix validation.
2002-12-21 John Levon <levon@movementarian.org> 2002-12-21 John Levon <levon@movementarian.org>
* FileDialog.C: * FileDialog.C:
@ -31,7 +36,7 @@
2002-12-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ui/QMathDialog.ui: * ui/QMathDialog.ui:
* QPrefsDialog.C (select_workingdir): fix typo * QPrefsDialog.C (select_workingdir): fix typo
2002-12-21 Dekel Tsur <dekelts@tau.ac.il> 2002-12-21 Dekel Tsur <dekelts@tau.ac.il>
@ -52,7 +57,7 @@
2002-12-19 John Levon <levon@movementarian.org> 2002-12-19 John Levon <levon@movementarian.org>
* QLyXKeySym.C: do not attempt to compare Qt::Key_unknowns * QLyXKeySym.C: do not attempt to compare Qt::Key_unknowns
2002-12-19 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-19 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyx_gui.C (getStatus): forks-show is not implemented by the qt * lyx_gui.C (getStatus): forks-show is not implemented by the qt
@ -64,13 +69,13 @@
StyleHint to get one close by StyleHint to get one close by
2002-12-18 Alfredo Braunstein <abraunst@libero.it> 2002-12-18 Alfredo Braunstein <abraunst@libero.it>
* QRef.C (redoRefs): small bug fix (wrong label was selected) * QRef.C (redoRefs): small bug fix (wrong label was selected)
2002-12-18 Edwin Leuven <e.leuven@uva.nl> 2002-12-18 Edwin Leuven <e.leuven@uva.nl>
* QCitationDialog.C: update styles combo when necessary * QCitationDialog.C: update styles combo when necessary
2002-12-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* Alert_pimpl.C (askForText_pimpl): replace qt_() with _() * Alert_pimpl.C (askForText_pimpl): replace qt_() with _()
@ -86,7 +91,7 @@
2002-12-18 Edwin Leuven <e.leuven@uva.nl> 2002-12-18 Edwin Leuven <e.leuven@uva.nl>
* BulletsModule.C: fix crash on custom bullet cancel * BulletsModule.C: fix crash on custom bullet cancel
2002-12-18 John Levon <levon@movementarian.org> 2002-12-18 John Levon <levon@movementarian.org>
* qfont_loader.C: symbol should not match "Standard Symbols 1" * qfont_loader.C: symbol should not match "Standard Symbols 1"
@ -122,64 +127,64 @@
2002-12-16 Edwin Leuven <e.leuven@uva.nl> 2002-12-16 Edwin Leuven <e.leuven@uva.nl>
* BulletsModule.C: forgot to remove an include of * BulletsModule.C: forgot to remove an include of
bulletstrings.[Ch] removed in the previous commit bulletstrings.[Ch] removed in the previous commit
2002-12-16 Edwin Leuven <e.leuven@uva.nl> 2002-12-16 Edwin Leuven <e.leuven@uva.nl>
* BulletsModule.[Ch]: Fix bulletstuff * BulletsModule.[Ch]: Fix bulletstuff
* QDocument.C: * QDocument.C:
* QDocumentDialog.C: * QDocumentDialog.C:
* ui/BulletsModuleBase.ui: * ui/BulletsModuleBase.ui:
2002-12-12 John Levon <levon@movementarian.org> 2002-12-12 John Levon <levon@movementarian.org>
* QSpellcheckerDialog.h: * QSpellcheckerDialog.h:
* QSpellcheckerDialog.C: * QSpellcheckerDialog.C:
* QSpellchecker.C: place broken word in replace box * QSpellchecker.C: place broken word in replace box
for user fixing for user fixing
2002-12-12 John Levon <levon@movementarian.org> 2002-12-12 John Levon <levon@movementarian.org>
* FileDialog_private.C: don't mess with windows z-ordering * FileDialog_private.C: don't mess with windows z-ordering
when opening a dialog (appear above focusWidget) when opening a dialog (appear above focusWidget)
2002-12-12 John Levon <levon@movementarian.org> 2002-12-12 John Levon <levon@movementarian.org>
* QLyXKeySym.C: check for isNull(). It's needed by * QLyXKeySym.C: check for isNull(). It's needed by
Kornel, dunno why Kornel, dunno why
2002-12-12 John Levon <levon@movementarian.org> 2002-12-12 John Levon <levon@movementarian.org>
* ui/QSpellcheckerDialog.ui: make double click replace word * ui/QSpellcheckerDialog.ui: make double click replace word
2002-12-12 John Levon <levon@movementarian.org> 2002-12-12 John Levon <levon@movementarian.org>
* QSearchDialog.C: * QSearchDialog.C:
* ui/QSearchDialog.ui: fixes from Alfredo * ui/QSearchDialog.ui: fixes from Alfredo
2002-12-12 John Levon <levon@movementarian.org> 2002-12-12 John Levon <levon@movementarian.org>
* QLyxKeySym.h: * QLyxKeySym.h:
* QLyXKeySym.C: * QLyXKeySym.C:
* qlkey.h: implement isText() to allow us to insert * qlkey.h: implement isText() to allow us to insert
unrecognised text unrecognised text
2002-12-11 John Levon <levon@movementarian.org> 2002-12-11 John Levon <levon@movementarian.org>
* qfont_loader.h: * qfont_loader.h:
* qfont_loader.C: * qfont_loader.C:
* qfont_metrics.C: cache per-char widths to avoid slowness * qfont_metrics.C: cache per-char widths to avoid slowness
of QFontMetrics::width of QFontMetrics::width
2002-12-10 John Levon <levon@movementarian.org> 2002-12-10 John Levon <levon@movementarian.org>
* ui/QURLDialog.ui: fix tab order * ui/QURLDialog.ui: fix tab order
2002-12-10 John Levon <levon@movementarian.org> 2002-12-10 John Levon <levon@movementarian.org>
* QRef.C: patch from Alfredo * QRef.C: patch from Alfredo
2002-12-09 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-12-09 Lars Gullik Bjønnes <larsbj@birdstep.com>
* QAbout.C (build_dialog): use old over-eager version for 1.3.0. * QAbout.C (build_dialog): use old over-eager version for 1.3.0.

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

@ -1,5 +1,69 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
EXTRA_DIST = $(SRCS)
SRCS = \
BiblioModuleBase.ui \
BulletsModuleBase.ui \
ClassModuleBase.ui \
LanguageModuleBase.ui \
MarginsModuleBase.ui \
NumberingModuleBase.ui \
PackagesModuleBase.ui \
PaperModuleBase.ui \
PreambleModuleBase.ui \
QAboutDialog.ui \
QAskForTextDialog.ui \
QBibitemDialog.ui \
QBibtexDialog.ui \
QCharacterDialog.ui \
QCitationDialog.ui \
QDelimiterDialog.ui \
QDocumentDialog.ui \
QErrorDialog.ui \
QERTDialog.ui \
QExternalDialog.ui \
QFloatDialog.ui \
QGraphicsDialog.ui \
QIncludeDialog.ui \
QIndexDialog.ui \
QLogDialog.ui \
QMathDialog.ui \
QMathMatrixDialog.ui \
QMinipageDialog.ui \
QParagraphDialog.ui \
QPreambleDialog.ui \
QPrefAsciiModule.ui \
QPrefColorsModule.ui \
QPrefConvertersModule.ui \
QPrefDateModule.ui \
QPrefDisplayModule.ui \
QPrefFileformatsModule.ui \
QPrefKeyboardModule.ui \
QPrefLanguageModule.ui \
QPrefLatexModule.ui \
QPrefPathsModule.ui \
QPrefPrinterModule.ui \
QPrefScreenFontsModule.ui \
QPrefsDialog.ui \
QPrefSpellcheckerModule.ui \
QPrefUIModule.ui \
QPrintDialog.ui \
QRefDialog.ui \
QSearchDialog.ui \
QSendtoDialog.ui \
QShowFileDialog.ui \
QSpellcheckerDialog.ui \
QTabularCreateDialog.ui \
QTabularDialog.ui \
QTexinfoDialog.ui \
QThesaurusDialog.ui \
QTocDialog.ui \
QURLDialog.ui \
QVCLogDialog.ui \
QWrapDialog.ui
noinst_LTLIBRARIES = libqt2ui.la noinst_LTLIBRARIES = libqt2ui.la
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
@ -23,6 +87,11 @@ libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES)
# Use _() for localization instead of tr() or trUtf8() # Use _() for localization instead of tr() or trUtf8()
UICFLAGS=-tr qt_ UICFLAGS=-tr qt_
%.h: %.ui
$(UIC) $(UICFLAGS) $< -o $@
%.C: %.h %.ui
$(UIC) $(UICFLAGS) -impl $^ -o $@
QAskForTextDialog.h: QAskForTextDialog.ui QAskForTextDialog.h: QAskForTextDialog.ui
$(UIC) $(UICFLAGS) $< -o $@ $(UIC) $(UICFLAGS) $< -o $@
QAskForTextDialog.C: QAskForTextDialog.h QAskForTextDialog.ui QAskForTextDialog.C: QAskForTextDialog.h QAskForTextDialog.ui

14
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,11 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* forms/Makefile.am (MAINTAINERCLEANFILES): add
(clean-local): delete
(distclean-local): delete
(.fd.C): delete
(%.C): add
2003-01-12 Angus Leeming <leeming@lyx.org> 2003-01-12 Angus Leeming <leeming@lyx.org>
* FormFiledialog.[Ch]: initialise and use new static member variables * FormFiledialog.[Ch]: initialise and use new static member variables
@ -45,14 +53,14 @@
2002-12-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* FormSpellchecker.C (build): * FormSpellchecker.C (build):
* forms/form_paragraph.fd: * forms/form_paragraph.fd:
* forms/form_maths_matrix.fd: remove extra spaces * forms/form_maths_matrix.fd: remove extra spaces
2002-12-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* Menubar_pimpl.C (create_submenu): do not query the status of a * Menubar_pimpl.C (create_submenu): do not query the status of a
separator. separator.
2002-12-18 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-12-18 Lars Gullik Bjønnes <larsbj@birdstep.com>

11
src/frontends/xforms/forms/Makefile.am
View File

@ -45,6 +45,8 @@ SRCS = form_aboutlyx.fd \
form_url.fd \ form_url.fd \
form_wrap.fd form_wrap.fd
MAINTAINERCLEANFILES += *.C *.h *.c
libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h) libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h)
# These are used to generate the .[Ch] files from the .fd ones. # These are used to generate the .[Ch] files from the .fd ones.
@ -57,12 +59,5 @@ $(libfdesign_la_SOURCES): $(srcdir)/fdfix.sh $(srcdir)/fdfix[ch].sed
libfdesign.la: $(libfdesign_la_OBJECTS) $(libfdesign_la_DEPENDENCIES) libfdesign.la: $(libfdesign_la_OBJECTS) $(libfdesign_la_DEPENDENCIES)
.fd.C: %.C: %.fd
$(SHELL) $(SCRIPT) $< $(SHELL) $(SCRIPT) $<
clean-local:
rm -f *.[Ch] *.[ch]pp *.orig \
rm -f $(srcdir)/*.[hc] $(srcdir)/*.bak
distclean-local:
rm -f $(srcdir)/*.orig $(srcdir)/*.rej $(srcdir)/*~