From bb8fcec6c99f028cbcd015e6d757c662fdf56517 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 5 Jan 2005 15:35:42 +0000 Subject: [PATCH] improve link trick and remove some duplicates git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9435 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 9 +++++++-- src/frontends/qt2/moc/Makefile.am | 2 +- src/frontends/qt2/ui/moc/Makefile.am | 2 +- src/frontends/xforms/ChangeLog | 16 +++++++++++----- src/frontends/xforms/forms/Makefile.am | 2 +- src/frontends/xforms/pch.h | 3 --- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 2f55d2307d..96f5b654a1 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,10 +1,15 @@ +2005-01-05 Lars Gullik Bjonnes + + * ui/moc/Makefile.am (libqt2uimoc_la_LINK): improve link trick + * moc/Makefile.am (libqt2moc_la_LINK): ditto + 2005-01-05 Jürgen Spitzmüller * QPrefs.C: store all float/double values as strings. lyxrc.dpi is an int value now. - + * QFontLoader.C: lyxrc.font_sizes is a string now. - + * lyx_gui.C: change getDVI() to int. 2005-01-05 Lars Gullik Bjonnes diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am index e2f373e0fa..effc4c54a2 100644 --- a/src/frontends/qt2/moc/Makefile.am +++ b/src/frontends/qt2/moc/Makefile.am @@ -16,7 +16,7 @@ noinst_LTLIBRARIES = libqt2moc.la nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C) # The trick. -libqt2moc_la_LINK = touch libqt2moc.la +libqt2moc_la_LINK = touch libqt2moc.la ; echo %_moc.C: $(srcdir)/../%.h $(MOC) -o $@ $< diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am index f55e417187..b35519010b 100644 --- a/src/frontends/qt2/ui/moc/Makefile.am +++ b/src/frontends/qt2/ui/moc/Makefile.am @@ -15,7 +15,7 @@ noinst_LTLIBRARIES = libqt2uimoc.la nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C) # The trick. -libqt2uimoc_la_LINK = touch libqt2uimoc.la +libqt2uimoc_la_LINK = touch libqt2uimoc.la ; echo %_moc.C: ../%.h $(MOC) -o $@ $< diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 4a771b96f5..fec6f10a43 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,10 +1,16 @@ +2005-01-05 Lars Gullik Bjonnes + + * pch.h: remove duplicate entries + + * forms/Makefile.am: improve link trick + 2005-01-05 Jürgen Spitzmüller * FormPreferences.C: store all float/double values as strings. lyxrc.dpi is an int value now. - + * xfont_loader.C: lyxrc.font_sizes is a string now. - + * lyx_gui.C: change getDVI() to int. 2005-01-04 Jürgen Spitzmüller @@ -14,9 +20,9 @@ 2005-01-03 Jean-Marc Lasgouttes - * freebrowser.c (browser_cb): - * combox.c (combox_handle, state_cb, chosen_cb): - * bmtable.c (handle_bitmaptable, fl_replace_bmtable_item) + * freebrowser.c (browser_cb): + * combox.c (combox_handle, state_cb, chosen_cb): + * bmtable.c (handle_bitmaptable, fl_replace_bmtable_item) (fl_get_bmtable_item): Silence warnings about unused parameters. 2004-12-28 Jean-Marc Lasgouttes diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index 3d1419cddf..1591485144 100644 --- a/src/frontends/xforms/forms/Makefile.am +++ b/src/frontends/xforms/forms/Makefile.am @@ -55,7 +55,7 @@ nodist_libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h) # This is a trick so that the actual .la file never gets build, # so we do not need to use diskspace and time for it. # It is only getting linked into libxforms.la anyway. -libfdesign_la_LINK = touch libfdesign.la +libfdesign_la_LINK = touch libfdesign.la ; echo # These are used to generate the .[Ch] files from the .fd ones. SHELL = /bin/sh diff --git a/src/frontends/xforms/pch.h b/src/frontends/xforms/pch.h index a24c0eb250..7b026a97a2 100644 --- a/src/frontends/xforms/pch.h +++ b/src/frontends/xforms/pch.h @@ -3,10 +3,7 @@ #include "lyx_forms.h" #include #include -#include // Window #include -#include // for Pixmap -#include // for Pixmap, GC #include #include -- 2.39.2