Angus Leeming wrote:
> Ling Li wrote:
>> Compiled OK. Just one small problem:
>> src/frontends/gtk/gimages/*.xpm are not included in the
>> distribution tar ball (make dist-bzip2).
>
> Thanks, Ling. I have a patch, which I'll post once cvs responds
> again...
Ok, nothing wrong with cvs. It just took it ages to ascertain all the
changes to the po files that were caused by the invocation of
msgmerge by 'make distdir'.
Attached is the gtk patch, as promised. Please confirm it works for
you.
Jean-Marc, does this look OK to you?
--
Angus
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.960
diff -u -p -r1.960 ChangeLog
--- ChangeLog 3 Apr 2004 09:06:16 -0000 1.960
+++ ChangeLog 20 Apr 2004 10:02:19 -0000
@@ -1,3 +1,7 @@
+2004-04-20 Angus Leeming <[EMAIL PROTECTED]>
+
+ * configure.ac: (AC_CONFIG_FILES) add gtk/gimages Makefile.
+
2004-04-03 Lars Gullik Bjonnes <[EMAIL PROTECTED]>
* configure.ac: define BOOST_USER_CONFIG
Index: configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.16
diff -u -p -r1.16 configure.ac
--- configure.ac 3 Apr 2004 09:06:17 -0000 1.16
+++ configure.ac 20 Apr 2004 10:02:19 -0000
@@ -419,6 +419,7 @@ AC_CONFIG_FILES([Makefile \
src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \
src/frontends/xforms/forms/Makefile \
src/frontends/gtk/Makefile \
+ src/frontends/gtk/gimages/Makefile \
src/frontends/gtk/glade/Makefile \
src/frontends/qt2/Makefile \
src/frontends/qt2/moc/Makefile \
Index: src/frontends/gtk/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/ChangeLog,v
retrieving revision 1.39
diff -u -p -r1.39 ChangeLog
--- src/frontends/gtk/ChangeLog 20 Apr 2004 08:51:11 -0000 1.39
+++ src/frontends/gtk/ChangeLog 20 Apr 2004 10:02:24 -0000
@@ -1,3 +1,15 @@
+2004-04-20 Angus Leeming <[EMAIL PROTECTED]>
+
+ * Makefile.am (SUBDIRS): add gimages.
+
+ * gimages/.cvsignore: new file. Ignore Makefile.in, Makefile.
+
+ * gimages/Makefile.am: new file. Add the xpm files to EXTRA_DIST.
+
+ * glade/Makefile.am (GLADE_FILES): replace '*.glade' with the
+ names of the individual files.
+ 'make distdir' Now works when srcdir != builddir.
+
2004-04-08 Angus Leeming <[EMAIL PROTECTED]>
* GPainter.C: compile fixes.
Index: src/frontends/gtk/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/Makefile.am,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.am
--- src/frontends/gtk/Makefile.am 31 Mar 2004 22:09:51 -0000 1.12
+++ src/frontends/gtk/Makefile.am 20 Apr 2004 10:02:24 -0000
@@ -1,6 +1,6 @@
include $(top_srcdir)/config/common.am
-SUBDIRS = glade
+SUBDIRS = gimages glade
noinst_LTLIBRARIES = libgtk.la
Index: src/frontends/gtk/gimages/.cvsignore
===================================================================
RCS file: src/frontends/gtk/gimages/.cvsignore
diff -N src/frontends/gtk/gimages/.cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/gtk/gimages/.cvsignore 20 Apr 2004 10:02:24 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: src/frontends/gtk/gimages/Makefile.am
===================================================================
RCS file: src/frontends/gtk/gimages/Makefile.am
diff -N src/frontends/gtk/gimages/Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/gtk/gimages/Makefile.am 20 Apr 2004 10:02:24 -0000
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+ ams_arrow.xpm ams_brel.xpm ams_misc.xpm ams_nrel.xpm \
+ ams_ops.xpm arrow.xpm boperator.xpm brelats.xpm \
+ dots.xpm greek.xpm Makefile.am misc.xpm varsize.xpm
Index: src/frontends/gtk/glade/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/glade/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- src/frontends/gtk/glade/Makefile.am 2 Sep 2003 10:29:05 -0000 1.1
+++ src/frontends/gtk/glade/Makefile.am 20 Apr 2004 10:02:24 -0000
@@ -3,7 +3,10 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
GLADE_DIR = glade
-GLADE_FILES = *.glade
+GLADE_FILES = \
+ aboutlyx.glade mathDelim.glade mathPanel.glade \
+ print.glade search.glade tableCreate.glade text.glade \
+ url.glade
EXTRA_DIST = ${GLADE_FILES}
