diff --git a/config/ChangeLog b/config/ChangeLog index c8cf80d4cd..ad9b7bcb34 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,10 @@ +2003-01-12 Lars Gullik Bjønnes + + * 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 * lyxinclude.m4: diff --git a/config/common.am b/config/common.am index f7eb781203..f5a80603de 100644 --- a/config/common.am +++ b/config/common.am @@ -4,6 +4,8 @@ DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in +AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D + ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost diff --git a/config/xforms.m4 b/config/xforms.m4 index 22ba395e4e..d7d6f93782 100644 --- a/config/xforms.m4 +++ b/config/xforms.m4 @@ -67,7 +67,7 @@ AC_LANG_SAVE AC_LANG_C 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, [if test "$ac_cv_search_flimage_dup" != "none required" ; then XFORMS_IMAGE_LIB="-lflimage" diff --git a/development/ChangeLog b/development/ChangeLog index 6086a6edc5..09bed536cb 100644 --- a/development/ChangeLog +++ b/development/ChangeLog @@ -1,3 +1,7 @@ +2003-01-12 Lars Gullik Bjønnes + + * Makefile.am (EXTRA_DIST): dist generated spec file as well. + 2002-10-25 Kayvan A. Sylvan * lyx.spec.in (CFLAGS, CXXFLAGS): Fixed to use configure diff --git a/development/Makefile.am b/development/Makefile.am index 35f1da0d27..01ee6ff162 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -2,4 +2,4 @@ include $(top_srcdir)/config/common.am EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \ 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 diff --git a/src/ChangeLog b/src/ChangeLog index 717090548c..db6bff0cf3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-01-12 Lars Gullik Bjønnes + + * Makefile.am (LIBS): delete var + (lyx_LDADD): add @LIBS@ here instead. + 2003-01-06 Jean-Marc Lasgouttes * lyxfunc.C (getStatus): fix disabling of cut/paste of cells in a @@ -16,8 +21,8 @@ 2003-01-07 Jean-Marc Lasgouttes - * paragraph_pimpl.C (simpleTeXBlanks): - (simpleTeXSpecialChars): + * paragraph_pimpl.C (simpleTeXBlanks): + (simpleTeXSpecialChars): * paragraph.C (simpleTeXOnePar): make `column' unsigned. * tabular.C (latex): add some missing case statements. Reindent. @@ -55,7 +60,7 @@ 2002-12-26 Jean-Marc Lasgouttes - * text.C (insertChar): + * text.C (insertChar): * lyxrc.C (getDescription): remove extra spaces 2002-12-23 Jean-Marc Lasgouttes @@ -91,7 +96,7 @@ * lyxfunc.C: use LyXKeySym->isText() as last-ditch insert. Only remove shift modifier under strict circumstances. - + 2002-12-09 Lars Gullik Bjønnes * MenuBackend.C (expandToc): fix crash. diff --git a/src/Makefile.am b/src/Makefile.am index b899d9d189..5318e78ccd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,8 +6,6 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in SUBDIRS = mathed insets graphics support frontends -LIBS += @LIBS@ - bin_PROGRAMS = lyx 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 lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \ - $(PSPELL_LIBS) $(AIKSAURUS_LIBS) + $(PSPELL_LIBS) $(AIKSAURUS_LIBS) @LIBS@ #lyx_LDFLAGS=-Wl,-O1 diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 3eef910991..ed7fe8902c 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,8 @@ +2003-01-12 Lars Gullik Bjønnes + + * Makefile.am (LIBS): delete + (libfrontends_la_LDFLAGS): add with same as LIBS + 2003-01-11 Angus Leeming * screen.C (SplashScreen): load up banner.ppm rather than banner.xpm. @@ -14,7 +19,7 @@ 2002-12-12 John Levon * LyXKeySym.h: add isText() - + 2002-12-03 Lars Gullik Bjønnes * screen.C (fitCursor): remove usleep thingie diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index 1bf400490f..123095ea86 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -6,10 +6,9 @@ DIST_SUBDIRS = controllers xforms qt2 gnome noinst_LTLIBRARIES = libfrontends.la -LIBS += $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS) - INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(BOOST_INCLUDES) +libfrontends_la_LDFLAGS = $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS) libfrontends_la_LIBADD = $(FRONTEND_GUILIB) controllers/*.lo libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 0d2480c7f3..da97511f3f 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2003-01-12 Lars Gullik Bjønnes + + * ui/Makefile.am (EXTRA_DIST): dist ui files + (SRCS): var with all ui files + 2003-01-06 Michael Schmitt * FileDialog.C: @@ -17,9 +22,9 @@ * QtView.h: * QtView.C: 2003-01-04 Juergen Spitzmueller - - * QURL.C: isValid(): fix validation. - + + * QURL.C: isValid(): fix validation. + 2002-12-21 John Levon * FileDialog.C: @@ -31,7 +36,7 @@ 2002-12-26 Jean-Marc Lasgouttes - * ui/QMathDialog.ui: + * ui/QMathDialog.ui: * QPrefsDialog.C (select_workingdir): fix typo 2002-12-21 Dekel Tsur @@ -52,7 +57,7 @@ 2002-12-19 John Levon * QLyXKeySym.C: do not attempt to compare Qt::Key_unknowns - + 2002-12-19 Jean-Marc Lasgouttes * lyx_gui.C (getStatus): forks-show is not implemented by the qt @@ -64,13 +69,13 @@ StyleHint to get one close by 2002-12-18 Alfredo Braunstein - - * 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 * QCitationDialog.C: update styles combo when necessary - + 2002-12-18 Jean-Marc Lasgouttes * Alert_pimpl.C (askForText_pimpl): replace qt_() with _() @@ -86,7 +91,7 @@ 2002-12-18 Edwin Leuven * BulletsModule.C: fix crash on custom bullet cancel - + 2002-12-18 John Levon * qfont_loader.C: symbol should not match "Standard Symbols 1" @@ -122,64 +127,64 @@ 2002-12-16 Edwin Leuven - * BulletsModule.C: forgot to remove an include of + * BulletsModule.C: forgot to remove an include of bulletstrings.[Ch] removed in the previous commit - + 2002-12-16 Edwin Leuven * BulletsModule.[Ch]: Fix bulletstuff * QDocument.C: * QDocumentDialog.C: * ui/BulletsModuleBase.ui: - + 2002-12-12 John Levon * QSpellcheckerDialog.h: * QSpellcheckerDialog.C: * QSpellchecker.C: place broken word in replace box for user fixing - + 2002-12-12 John Levon * FileDialog_private.C: don't mess with windows z-ordering when opening a dialog (appear above focusWidget) - + 2002-12-12 John Levon * QLyXKeySym.C: check for isNull(). It's needed by Kornel, dunno why - + 2002-12-12 John Levon * ui/QSpellcheckerDialog.ui: make double click replace word - + 2002-12-12 John Levon * QSearchDialog.C: * ui/QSearchDialog.ui: fixes from Alfredo - + 2002-12-12 John Levon * QLyxKeySym.h: * QLyXKeySym.C: * qlkey.h: implement isText() to allow us to insert unrecognised text - + 2002-12-11 John Levon * qfont_loader.h: * qfont_loader.C: * qfont_metrics.C: cache per-char widths to avoid slowness of QFontMetrics::width - + 2002-12-10 John Levon * ui/QURLDialog.ui: fix tab order - + 2002-12-10 John Levon * QRef.C: patch from Alfredo - + 2002-12-09 Lars Gullik Bjønnes * QAbout.C (build_dialog): use old over-eager version for 1.3.0. diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am index a0eaff231a..bbf5887fea 100644 --- a/src/frontends/qt2/ui/Makefile.am +++ b/src/frontends/qt2/ui/Makefile.am @@ -1,5 +1,69 @@ 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 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() UICFLAGS=-tr qt_ +%.h: %.ui + $(UIC) $(UICFLAGS) $< -o $@ +%.C: %.h %.ui + $(UIC) $(UICFLAGS) -impl $^ -o $@ + QAskForTextDialog.h: QAskForTextDialog.ui $(UIC) $(UICFLAGS) $< -o $@ QAskForTextDialog.C: QAskForTextDialog.h QAskForTextDialog.ui diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 473877b950..f0c23bd10a 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,11 @@ +2003-01-12 Lars Gullik Bjønnes + + * forms/Makefile.am (MAINTAINERCLEANFILES): add + (clean-local): delete + (distclean-local): delete + (.fd.C): delete + (%.C): add + 2003-01-12 Angus Leeming * FormFiledialog.[Ch]: initialise and use new static member variables @@ -45,14 +53,14 @@ 2002-12-23 Jean-Marc Lasgouttes - * FormSpellchecker.C (build): - * forms/form_paragraph.fd: + * FormSpellchecker.C (build): + * forms/form_paragraph.fd: * forms/form_maths_matrix.fd: remove extra spaces 2002-12-18 Jean-Marc Lasgouttes * Menubar_pimpl.C (create_submenu): do not query the status of a - separator. + separator. 2002-12-18 Lars Gullik Bjønnes diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index 9b446d6b9d..e81a8a7c4f 100644 --- a/src/frontends/xforms/forms/Makefile.am +++ b/src/frontends/xforms/forms/Makefile.am @@ -45,6 +45,8 @@ SRCS = form_aboutlyx.fd \ form_url.fd \ form_wrap.fd +MAINTAINERCLEANFILES += *.C *.h *.c + libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h) # 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) -.fd.C: +%.C: %.fd $(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)/*~