summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMenTaLguY <mental@rydia.net>2006-07-25 18:33:02 +0000
committermental <mental@users.sourceforge.net>2006-07-25 18:33:02 +0000
commit7ccea868d1bdcb62d74728531cf9f1aef94c540e (patch)
tree2f2fb83f7c9a87c2385fb1c6e498392665634294
parentremove lsbcc check for now (diff)
downloadinkscape-7ccea868d1bdcb62d74728531cf9f1aef94c540e.tar.gz
inkscape-7ccea868d1bdcb62d74728531cf9f1aef94c540e.zip
remove vestigal plugin support
(bzr r1473)
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac14
-rw-r--r--src/Makefile.am1
-rw-r--r--src/extension/plugin/.cvsignore7
-rw-r--r--src/extension/plugin/Makefile_insert30
-rw-r--r--src/extension/plugin/makefile.in17
6 files changed, 8 insertions, 69 deletions
diff --git a/ChangeLog b/ChangeLog
index dfc812452..e741b9e76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-25 MenTaLguY <mental@rydia.net>
+
+ * src/extension/plugin, src/extension/plugin/Makefile_insert,
+ src/extension/plugin/makefile.in, src/extension/plugin/.cvsignore,
+ src/Makefile.am, configure.ac:
+
+ remove vestigal plugin support
+
2006-07-24 MenTaLguY <mental@rydia.net>
* configure.ac: further work on LSB build configuration
diff --git a/configure.ac b/configure.ac
index d9dccd6fb..0f2320c4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -679,19 +679,6 @@ if test "$GXX" = "yes"; then
esac
fi
-dnl ******************************
-dnl Plugin Support
-dnl ******************************
-dnl
-dnl UPDATE: This is unconditional now (Lauris)
-dnl
-dnl AC_ARG_WITH(modules, AC_HELP_STRING([--with-modules], [Compile with plugin support (experimental)]), [mod=$withval], [mod=yes])
-dnl
-dnl AM_CONDITIONAL(USE_MODULES, test "x$mod" = "xyes")
-dnl if test "x$mod" = "xyes"; then
-dnl AC_DEFINE(WITH_MODULES, 1, [Use experimental module support])
-dnl fi
-
AC_DEFINE(WITH_MODULES, 1, [Use experimental module support])
dnl ******************************
@@ -803,7 +790,6 @@ src/dom/makefile
src/extension/implementation/makefile
src/extension/internal/makefile
src/extension/makefile
-src/extension/plugin/makefile
src/extension/script/makefile
src/helper/makefile
src/inkjar/makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 2a0e10c8f..764ae3dc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -125,7 +125,6 @@ EXTRA_DIST = \
extension/implementation/makefile.in \
extension/internal/makefile.in \
extension/makefile.in \
- extension/plugin/makefile.in \
extension/script/makefile.in \
helper/makefile.in \
inkjar/makefile.in \
diff --git a/src/extension/plugin/.cvsignore b/src/extension/plugin/.cvsignore
deleted file mode 100644
index 70c7c16b2..000000000
--- a/src/extension/plugin/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.dll
-*.la
-*.lo
-.deps
-.dirstamp
-.libs
-makefile
diff --git a/src/extension/plugin/Makefile_insert b/src/extension/plugin/Makefile_insert
deleted file mode 100644
index a36b52d99..000000000
--- a/src/extension/plugin/Makefile_insert
+++ /dev/null
@@ -1,30 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-plugindir = $(libdir)/inkscape/plugins
-
-plugin_LTLIBRARIES = \
- extension/plugin/libgimpgrad.la \
- extension/plugin/libgrid.la \
- extension/plugin/libbluredge.la \
- extension/plugin/librandompnt.la \
- extension/plugin/librandompos.la
-
-extension/plugin/clean:
- rm -f $(plugin_LTLIBRARIES)
-
-extension_plugin_libgimpgrad_la_SOURCES = \
- extension/plugin/gimpgrad.cpp
-
-extension_plugin_libgrid_la_SOURCES = \
- extension/plugin/grid.cpp
-
-extension_plugin_libbluredge_la_SOURCES = \
- extension/plugin/bluredge.cpp
-
-extension_plugin_librandompnt_la_SOURCES = \
- extension/plugin/randompnt.cpp
-
-extension_plugin_librandompos_la_SOURCES = \
- extension/plugin/randompos.cpp
-
-## extension_plugin_libtest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
diff --git a/src/extension/plugin/makefile.in b/src/extension/plugin/makefile.in
deleted file mode 100644
index 9de8caf05..000000000
--- a/src/extension/plugin/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-# Explicit so that it's the default rule.
-all:
- cd ../.. && $(MAKE) extension/plugin/all
-
-clean %.a %.o:
- cd ../.. && $(MAKE) extension/plugin/$@
-
-.PHONY: all clean
-
-OBJEXT = @OBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)