Would be nice if someone that compiles gtk regularly could try this
out. (If not I will commit it anyway, and you will find out the hard
was if it works or not :-) )
? gtk-1.diff
Index: gimages/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/gimages/Makefile.am,v
retrieving revision 1.1
diff -u -p -B -b -w -r1.1 Makefile.am
--- gimages/Makefile.am 20 Apr 2004 10:38:48 -0000 1.1
+++ gimages/Makefile.am 5 Dec 2004 21:00:10 -0000
@@ -1,4 +1,15 @@
-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
+include $(top_srcdir)/config/common.am
+
+dist_noinst_DATA = \
+ 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 \
+ misc.xpm \
+ varsize.xpm
Index: glade/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/glade/Makefile.am,v
retrieving revision 1.3
diff -u -p -B -b -w -r1.3 Makefile.am
--- glade/Makefile.am 27 Sep 2004 18:52:43 -0000 1.3
+++ glade/Makefile.am 5 Dec 2004 21:00:10 -0000
@@ -1,9 +1,9 @@
-DISTCLEANFILES = *.orig *.rej *~ *.bak *.gladep
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
-GLADE_DIR = glade
+DISTCLEANFILES += *.gladep
-GLADE_FILES = \
+gladedir = $(pkgdatadir)/glade
+dist_glade_DATA = \
aboutlyx.glade \
character.glade \
mathDelim.glade \
@@ -13,17 +13,3 @@ GLADE_FILES = \
tableCreate.glade \
text.glade \
url.glade
-
-EXTRA_DIST = ${GLADE_FILES}
-
-gladeinstalldirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/${GLADE_DIR} ;
-
-install-data-local: gladeinstalldirs
- files=`cd $(srcdir) ; echo $(GLADE_FILES)` ; \
- for i in $${files} ; do \
- $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/${GLADE_DIR}/$$i ; \
- done
-
-dist-hook:
- cd $(distdir) ; rm -rf `find . -name \*CVS\*` ;
--
Lgb
