Make 'make distdir' work again.

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

diff --git a/ChangeLog b/ChangeLog
index f45a8650a636fdac367408e881f275a7f80153bd..9c71c8913372798a1e24a2092f8d8bde5683966a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-20  Angus Leeming  <leeming@lyx.org>
+
+       * configure.ac: (AC_CONFIG_FILES) add gtk/gimages Makefile.
+
 2004-04-03  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * configure.ac: define BOOST_USER_CONFIG

diff --git a/configure.ac b/configure.ac
index efb3ccaf1c2f660b85355a3fbf1f9486f4e11c5e..877902681395b99898bc767991ab1b4385fa5828 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 \

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 4db0e39d7f32aad58b004f2ce49786d8149739a8..1dc055a67c09ebd7ea859b7946594c7d0679f152 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-20  Angus Leeming  <leeming@lyx.org>
+
+       * 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  <leeming@lyx.org>
 
        * GPainter.C: compile fixes.

diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am
index 48f1f179d5b925984d9f9b4ac049079308a26a53..63fcc5441d75180b0ea8e6e45e5709b05971bdc3 100644 (file)
--- a/src/frontends/gtk/Makefile.am
+++ b/src/frontends/gtk/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/common.am
 
-SUBDIRS = glade
+SUBDIRS = gimages glade
 
 noinst_LTLIBRARIES = libgtk.la
 

diff --git a/src/frontends/gtk/gimages/.cvsignore b/src/frontends/gtk/gimages/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/src/frontends/gtk/gimages/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/src/frontends/gtk/gimages/Makefile.am b/src/frontends/gtk/gimages/Makefile.am
new file mode 100644 (file)
index 0000000..a9768b2
--- /dev/null
+++ b/src/frontends/gtk/gimages/Makefile.am
@@ -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

diff --git a/src/frontends/gtk/glade/Makefile.am b/src/frontends/gtk/glade/Makefile.am
index 74195b50a1f0a96201141bc11345008e32f9b0d7..98b2f73596103b1ae186be95246ae6d8ce0e91e9 100644 (file)
--- a/src/frontends/gtk/glade/Makefile.am
+++ b/src/frontends/gtk/glade/Makefile.am
@@ -3,7 +3,10 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 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}