From: Angus Leeming Date: Tue, 20 Apr 2004 10:38:48 +0000 (+0000) Subject: Make 'make distdir' work again. X-Git-Tag: 1.6.10~15287 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=345f0f0b23e6117b3673fbc43f21f05957e750c8;p=lyx.git 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 f45a8650a6..9c71c89133 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-04-20 Angus Leeming + + * configure.ac: (AC_CONFIG_FILES) add gtk/gimages Makefile. + 2004-04-03 Lars Gullik Bjonnes * configure.ac: define BOOST_USER_CONFIG diff --git a/configure.ac b/configure.ac index efb3ccaf1c..8779026813 100644 --- 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 4db0e39d7f..1dc055a67c 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,15 @@ +2004-04-20 Angus Leeming + + * 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 * GPainter.C: compile fixes. diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am index 48f1f179d5..63fcc5441d 100644 --- 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 index 0000000000..282522db03 --- /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 index 0000000000..a9768b2d9d --- /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 74195b50a1..98b2f73596 100644 --- 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}