From 5d655a6dece0045a227f7c7d16d2909c2587d8ed Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Tue, 29 Jul 2003 20:04:50 +0000 Subject: [PATCH] * quite a lot of patches in the building stuff --- helm/gtkmathview-bonobo/Makefile.am | 2 +- helm/gtkmathview-bonobo/configure.ac | 4 ++-- helm/gtkmathview-bonobo/src/.cvsignore | 2 ++ ...thView.server.in => GNOME_GtkMathView.server.in.in} | 2 +- helm/gtkmathview-bonobo/src/Makefile.am | 10 ++++++++++ 5 files changed, 16 insertions(+), 4 deletions(-) rename helm/gtkmathview-bonobo/src/{GNOME_GtkMathView.server.in => GNOME_GtkMathView.server.in.in} (95%) diff --git a/helm/gtkmathview-bonobo/Makefile.am b/helm/gtkmathview-bonobo/Makefile.am index 8f5e45f8d..8524127c1 100644 --- a/helm/gtkmathview-bonobo/Makefile.am +++ b/helm/gtkmathview-bonobo/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = BUGS HISTORY LICENSE ANNOUNCEMENT CONTRIBUTORS config.h.in +EXTRA_DIST = config.h.in SUBDIRS = src test CLEANFILES = core *.log *.eps diff --git a/helm/gtkmathview-bonobo/configure.ac b/helm/gtkmathview-bonobo/configure.ac index 7eee2686c..06f35c6d0 100644 --- a/helm/gtkmathview-bonobo/configure.ac +++ b/helm/gtkmathview-bonobo/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(gtkmathview-bonobo, [0.0.1]) -AC_CONFIG_SRCDIR(src/GNOME_GtkMathView.server.in) +AC_CONFIG_SRCDIR(src/GNOME_GtkMathView.server.in.in) AM_INIT_AUTOMAKE($AC_PACKAGE_NAME, $AC_PACKAGE_VERSION) PACKAGE=$PACKAGE_NAME @@ -101,7 +101,7 @@ AC_CONFIG_FILES([ Makefile gtkmathview-bonobo.pc src/Makefile - src/GNOME_GtkMathView.server + src/GNOME_GtkMathView.server.in test/Makefile ]) AC_OUTPUT diff --git a/helm/gtkmathview-bonobo/src/.cvsignore b/helm/gtkmathview-bonobo/src/.cvsignore index d4c91def3..f7ad5df6d 100644 --- a/helm/gtkmathview-bonobo/src/.cvsignore +++ b/helm/gtkmathview-bonobo/src/.cvsignore @@ -1,7 +1,9 @@ .deps .libs GNOME_GtkMathView.server +GNOME_GtkMathView.server.in Makefile Makefile.in libgtkmathview-bonobo.la control-factory.lo +persist-file.lo diff --git a/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in b/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in.in similarity index 95% rename from helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in rename to helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in.in index 75ba9d978..17ba5ee6e 100644 --- a/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in +++ b/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in.in @@ -1,7 +1,7 @@ + location="@GTKMATHVIEW_FACTORY_LOCATION@"> diff --git a/helm/gtkmathview-bonobo/src/Makefile.am b/helm/gtkmathview-bonobo/src/Makefile.am index b5dbb421b..e211a3861 100644 --- a/helm/gtkmathview-bonobo/src/Makefile.am +++ b/helm/gtkmathview-bonobo/src/Makefile.am @@ -1,4 +1,10 @@ +location = $(libdir)/libgtkmathview-bonobo.so +serverdir = $(libdir)/bonobo/servers +server_in_files = GNOME_GtkMathView.server.in.in + +CLEANFILES = $(server_in_files:.server.in.in=.server) + lib_LTLIBRARIES = libgtkmathview-bonobo.la libgtkmathview_bonobo_la_LIBADD = $(GTKMATHVIEW_LIBS) $(BONOBOUI_LIBS) $(BONOBO_LIBS) @@ -12,6 +18,10 @@ pkginclude_HEADERS = \ control-factory.h \ persist-file.h +server_DATA = $(server_in_files:.server.in.in=.server) +$(server_in_files:.server.in.in=.server): $(server_in_files:.server.in.in=.server.in) Makefile + sed -e "s|\@GTKMATHVIEW_FACTORY_LOCATION\@|$(location)|g" $< >$@ + INCLUDES = \ $(BONOBOUI_CFLAGS) \ $(BONOBO_CFLAGS) \ -- 2.39.2