improve link trick and remove some duplicates

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9435 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 2f55d2307d0dbb55cb65213caa5954e9d8c2c5a5..96f5b654a15c847b02013c67a9738292336bc2f1 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,10 +1,15 @@
+2005-01-05  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * ui/moc/Makefile.am (libqt2uimoc_la_LINK): improve link trick
+       * moc/Makefile.am (libqt2moc_la_LINK): ditto
+
 2005-01-05  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * 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  <larsbj@gullik.net>

diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am
index e2f373e0fa528b2d34ababa86dbc765d4f8970b0..effc4c54a23f12e9bb526ce7709a6e1322afdab3 100644 (file)
--- 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 f55e417187a76c963c5b5e0a41ae051d10ee177e..b35519010b2f80c5aac8d7a44b5cb5c9f7fab26c 100644 (file)
--- 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 4a771b96f514494b464d431235c3752754390043..fec6f10a4317e7dafb2996af72ed45deffae0929 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,10 +1,16 @@
+2005-01-05  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * pch.h: remove duplicate entries
+
+       * forms/Makefile.am: improve link trick
+
 2005-01-05  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * 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  <j.spitzmueller@gmx.de>
@@ -14,9 +20,9 @@
 
 2005-01-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
-       * 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  <lasgouttes@lyx.org>

diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am
index 3d1419cddf54c5942a88f1a2de9184ce5c6ee869..159148514416f97cb70a42db3227865d714f1c45 100644 (file)
--- 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 a24c0eb2506d9b243412b4bf6cf3745d105b8224..7b026a97a2f71b547ba7001be7b9125e27c07e55 100644 (file)
--- a/src/frontends/xforms/pch.h
+++ b/src/frontends/xforms/pch.h
@@ -3,10 +3,7 @@
 #include "lyx_forms.h"
 #include <X11/keysym.h>
 #include <X11/X.h>
-#include <X11/X.h> // Window
 #include <X11/Xlib.h>
-#include <X11/Xlib.h> // for Pixmap
-#include <X11/Xlib.h> // for Pixmap, GC
 #include <X11/xpm.h>
 
 #include <boost/assert.hpp>