From 204908ef8fb9009bf31575120133de293722064e Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Fri, 25 Jun 1999 01:29:23 +0000 Subject: [PATCH] plug-ins/common/mkgen.pl added a pattern rule to install single plugins * plug-ins/common/mkgen.pl * plug-ins/common/Makefile.am: added a pattern rule to install single plugins * all plugin Makefiles: use $libexecdir instead of $pluginlibdir so we get installed on make install-exec * plug-ins/gap/gap_filter_iterators.c: removed old Colorify_iter_ALT reference -Yosh --- ChangeLog | 12 ++++++++++++ modules/Makefile.am | 4 ++-- plug-ins/AlienMap/Makefile.am | 4 ++-- plug-ins/FractalExplorer/Makefile.am | 4 ++-- plug-ins/Lighting/Makefile.am | 4 ++-- plug-ins/MapObject/Makefile.am | 4 ++-- plug-ins/bmp/Makefile.am | 4 ++-- plug-ins/common/Makefile.am | 16 ++++++++++++++-- plug-ins/common/mkgen.pl | 12 ++++++++++-- plug-ins/dbbrowser/Makefile.am | 4 ++-- plug-ins/faxg3/Makefile.am | 4 ++-- plug-ins/fits/Makefile.am | 4 ++-- plug-ins/flame/Makefile.am | 4 ++-- plug-ins/fp/Makefile.am | 4 ++-- plug-ins/gap/Makefile.am | 4 ++-- plug-ins/gap/gap_filter_iterators.c | 1 - plug-ins/gdyntext/Makefile.am | 4 ++-- plug-ins/gfig/Makefile.am | 4 ++-- plug-ins/gfli/Makefile.am | 4 ++-- plug-ins/gpc/Makefile.am | 4 +--- plug-ins/ifscompose/Makefile.am | 4 ++-- plug-ins/maze/Makefile.am | 4 ++-- plug-ins/megawidget/Makefile.am | 4 ++-- plug-ins/mosaic/Makefile.am | 4 ++-- plug-ins/pagecurl/Makefile.am | 4 ++-- plug-ins/print/Makefile.am | 4 ++-- plug-ins/rcm/Makefile.am | 4 ++-- plug-ins/script-fu/Makefile.am | 4 ++-- plug-ins/sgi/Makefile.am | 4 ++-- plug-ins/sinus/Makefile.am | 4 ++-- plug-ins/struc/Makefile.am | 4 ++-- plug-ins/unsharp/Makefile.am | 4 ++-- plug-ins/webbrowser/Makefile.am | 4 ++-- plug-ins/xjt/Makefile.am | 4 ++-- 34 files changed, 95 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a43b77efe..b36a3d6bc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Thu Jun 24 18:13:35 PDT 1999 Manish Singh + + * plug-ins/common/mkgen.pl + * plug-ins/common/Makefile.am: added a pattern rule to install + single plugins + + * all plugin Makefiles: use $libexecdir instead of $pluginlibdir + so we get installed on make install-exec + + * plug-ins/gap/gap_filter_iterators.c: removed old Colorify_iter_ALT + reference + Thu Jun 24 22:49:41 BST 1999 Andy Thomas * layers_dialog.c diff --git a/modules/Makefile.am b/modules/Makefile.am index e2ca753e98..3b87b6314c 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -moduledir = $(gimpplugindir)/modules +libexecdir = $(gimpplugindir)/modules CPPFLAGS = \ -DMODULE_COMPILATION @@ -15,7 +15,7 @@ EXTRA_DIST = \ makefile.msc \ module.def -module_LTLIBRARIES = \ +libexec_LTLIBRARIES = \ libcolorsel_gtk.la \ libcolorsel_triangle.la \ libcolorsel_water.la diff --git a/plug-ins/AlienMap/Makefile.am b/plug-ins/AlienMap/Makefile.am index 57f6ad79b0..12e2256340 100644 --- a/plug-ins/AlienMap/Makefile.am +++ b/plug-ins/AlienMap/Makefile.am @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in -pluginlibdir = $(gimpplugindir)/plug-ins +libexecdir = $(gimpplugindir)/plug-ins -pluginlib_PROGRAMS = AlienMap +libexec_PROGRAMS = AlienMap AlienMap_SOURCES = \ AlienMap.c \ diff --git a/plug-ins/FractalExplorer/Makefile.am b/plug-ins/FractalExplorer/Makefile.am index 0632f0c132..8d4fb5c00a 100644 --- a/plug-ins/FractalExplorer/Makefile.am +++ b/plug-ins/FractalExplorer/Makefile.am @@ -2,9 +2,9 @@ SUBDIRS = fractalexplorer-examples -pluginlibdir = $(gimpplugindir)/plug-ins +libexecdir = $(gimpplugindir)/plug-ins -pluginlib_PROGRAMS = FractalExplorer +libexec_PROGRAMS = FractalExplorer FractalExplorer_SOURCES = \ Callbacks.h \ diff --git a/plug-ins/Lighting/Makefile.am b/plug-ins/Lighting/Makefile.am index 88b65b101c..838693340a 100644 --- a/plug-ins/Lighting/Makefile.am +++ b/plug-ins/Lighting/Makefile.am @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in -pluginlibdir = $(gimpplugindir)/plug-ins +libexecdir = $(gimpplugindir)/plug-ins -pluginlib_PROGRAMS = Lighting +libexec_PROGRAMS = Lighting Lighting_SOURCES = \ amb1.xpm \ diff --git a/plug-ins/MapObject/Makefile.am b/plug-ins/MapObject/Makefile.am index 0e1e1fc6c8..7909d02283 100644 --- a/plug-ins/MapObject/Makefile.am +++ b/plug-ins/MapObject/Makefile.am @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in -pluginlibdir = $(gimpplugindir)/plug-ins +libexecdir = $(gimpplugindir)/plug-ins -pluginlib_PROGRAMS = MapObject +libexec_PROGRAMS = MapObject MapObject_SOURCES = \ amb1.xpm \ diff --git a/plug-ins/bmp/Makefile.am b/plug-ins/bmp/Makefile.am index 1feb9f5089..f23b241f8f 100644 --- a/plug-ins/bmp/Makefile.am +++ b/plug-ins/bmp/Makefile.am @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in -pluginlibdir = $(gimpplugindir)/plug-ins +libexecdir = $(gimpplugindir)/plug-ins -pluginlib_PROGRAMS = bmp +libexec_PROGRAMS = bmp bmp_SOURCES = \ bmp.c \ diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am index 6ab8e1616e..022109d54f 100644 --- a/plug-ins/common/Makefile.am +++ b/plug-ins/common/Makefile.am @@ -1,4 +1,8 @@ -pluginlibdir = $(gimpplugindir)/plug-ins +libexecdir = $(gimpplugindir)/plug-ins + +EXTRA_DIST = \ + mkgen.pl \ + plugin-defs.pl AM_CPPFLAGS = \ -DLOCALEDIR=\""$(localedir)"\" @@ -8,7 +12,7 @@ INCLUDES = \ $(GTK_CFLAGS) \ -I$(includedir) -pluginlib_PROGRAMS = \ +libexec_PROGRAMS = \ CEL \ CML_explorer \ $(AA) \ @@ -132,6 +136,14 @@ EXTRA_PROGRAMS = \ tiff \ xpm +install-%: % + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIRS)$(libexecdir) + @if test -f $<; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $< $(DESTDIR)$(libexecdir)/`echo $<|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $< $(DESTDIR)$(libexecdir)/`echo $<|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi + CEL_SOURCES = \ CEL.c diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl index b0d3684ca6..94b3cb6aba 100755 --- a/plug-ins/common/mkgen.pl +++ b/plug-ins/common/mkgen.pl @@ -22,7 +22,7 @@ foreach (sort keys %plugins) { foreach ($bins, $opts) { s/ \\\n$//s } print MK <