Imported Upstream version 3.2

1 files changed, 28 insertions, 174 deletions

diff --git a/extra.mk.in b/extra.mk.in
index a300c83..464bbb0 100644
--- a/extra.mk.in
+++ b/extra.mk.in
@@ -1,183 +1,37 @@
-XGETTEXT ?= @XGETTEXT@
-pdfdir ?= @pdfdir@
-ECHO_N ?= @ECHO_N@
-CXXFLAGS ?= @CXXFLAGS@
-DBUS_BINDING_TOOL ?= @DBUS_BINDING_TOOL@
-PLUGIN_SUFFIX ?= @PLUGIN_SUFFIX@
-target ?= @target@
-CLEAN_LIB ?= @CLEAN_LIB@
-bindir ?= @bindir@
-INTL_LIBTOOL_SUFFIX_PREFIX ?= @INTL_LIBTOOL_SUFFIX_PREFIX@
-PACKAGE_URL ?= @PACKAGE_URL@
-ALLOCA ?= @ALLOCA@
-LIBGUESS_CFLAGS ?= @LIBGUESS_CFLAGS@
-PROG_IMPLIB_NEEDED ?= @PROG_IMPLIB_NEEDED@
-dvidir ?= @dvidir@
-AUDLDFLAGS ?= @AUDLDFLAGS@
-PACKAGE_BUGREPORT ?= @PACKAGE_BUGREPORT@
-MAKE ?= @MAKE@
-INSTOBJEXT ?= @INSTOBJEXT@
+AUDACIOUS_DEFINES ?= @AUDACIOUS_DEFINES@
+LIBAUDCLIENT_LDFLAGS ?= @LIBAUDCLIENT_LDFLAGS@
+USE_NLS ?= @USE_NLS@
+VERSION ?= @VERSION@
+
 CONTAINER_PLUGIN_DIR ?= @CONTAINER_PLUGIN_DIR@
-DATADIRNAME ?= @DATADIRNAME@
+EFFECT_PLUGIN_DIR ?= @EFFECT_PLUGIN_DIR@
+GENERAL_PLUGIN_DIR ?= @GENERAL_PLUGIN_DIR@
 INPUT_PLUGIN_DIR ?= @INPUT_PLUGIN_DIR@
-SM_CFLAGS ?= @SM_CFLAGS@
-POSUB ?= @POSUB@
-CPP ?= @CPP@
-MKINSTALLDIRS ?= @MKINSTALLDIRS@
-target_cpu ?= @target_cpu@
-DBUS_LIBS ?= @DBUS_LIBS@
-UNINSTALL_LIB ?= @UNINSTALL_LIB@
-datadir ?= @datadir@
-build ?= @build@
-CPPFLAGS ?= @CPPFLAGS@
-SHELL ?= @SHELL@
+OUTPUT_PLUGIN_DIR ?= @OUTPUT_PLUGIN_DIR@
+TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
+VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@
+
+DBUS_BINDING_TOOL ?= @DBUS_BINDING_TOOL@
+HAVE_MSWINDOWS ?= @HAVE_MSWINDOWS@
+USE_CHARDET ?= @USE_CHARDET@
+USE_DBUS ?= @USE_DBUS@
 USE_EGGSM ?= @USE_EGGSM@
-GLIB_GENMARSHAL ?= @GLIB_GENMARSHAL@
-LIBMCS_LIBS ?= @LIBMCS_LIBS@
-am__leading_dot ?= @am__leading_dot@
-program_transform_name ?= @program_transform_name@
-INTL_OBJECTIVE ?= @INTL_OBJECTIVE@
-SIMD_CFLAGS ?= @SIMD_CFLAGS@
-CC ?= @CC@
-CATOBJEXT ?= @CATOBJEXT@
-DEFS ?= @DEFS@
-LIBS ?= @LIBS@
-build_cpu ?= @build_cpu@
-infodir ?= @infodir@
-GLIB_CFLAGS ?= @GLIB_CFLAGS@
-AMDEPBACKSLASH ?= @AMDEPBACKSLASH@
-GENERAL_PLUGIN_DIR ?= @GENERAL_PLUGIN_DIR@
-libexecdir ?= @libexecdir@
-localedir ?= @localedir@
-CCASDEPMODE ?= @CCASDEPMODE@
-LTLIBOBJS ?= @LTLIBOBJS@
-LIBICONV ?= @LIBICONV@
-includedir ?= @includedir@
-LDFLAGS ?= @LDFLAGS@
-build_alias ?= @build_alias@
-USE_NLS ?= @USE_NLS@
-AUDACIOUS_DEFINES ?= @AUDACIOUS_DEFINES@
-libdir ?= @libdir@
-CFLAGS ?= @CFLAGS@
-REGEX_LIBS ?= @REGEX_LIBS@
-PTHREAD_LIBS ?= @PTHREAD_LIBS@
-localstatedir ?= @localstatedir@
-DISCOVERY_PLUGIN_DIR ?= @DISCOVERY_PLUGIN_DIR@
-docdir ?= @docdir@
-LIBGUESS_LIBS ?= @LIBGUESS_LIBS@
-LIB_LDFLAGS ?= @LIB_LDFLAGS@
-CCASFLAGS ?= @CCASFLAGS@
-INSTALL_SCRIPT ?= @INSTALL_SCRIPT@
-host_alias ?= @host_alias@
-PACKAGE_TARNAME ?= @PACKAGE_TARNAME@
-RANLIB ?= @RANLIB@
+
 DBUS_CFLAGS ?= @DBUS_CFLAGS@
-OUTPUT_PLUGIN_DIR ?= @OUTPUT_PLUGIN_DIR@
-pluginsubs ?= @pluginsubs@
-PATH_SEPARATOR ?= @PATH_SEPARATOR@
-EXEEXT ?= @EXEEXT@
-MV ?= @MV@
+DBUS_LIBS ?= @DBUS_LIBS@
+GLIB_CFLAGS ?= @GLIB_CFLAGS@
 GLIB_LIBS ?= @GLIB_LIBS@
-GMSGFMT ?= @GMSGFMT@
-target_os ?= @target_os@
-AR ?= @AR@
-host ?= @host@
+GTHREAD_CFLAGS ?= @GTHREAD_CFLAGS@
 GTHREAD_LIBS ?= @GTHREAD_LIBS@
-LIBINTL ?= @LIBINTL@
-target_vendor ?= @target_vendor@
-CCAS ?= @CCAS@
-desktop_file ?= @desktop_file@
-prefix ?= @prefix@
-LIB_CFLAGS ?= @LIB_CFLAGS@
-REGEX_CFLAGS ?= @REGEX_CFLAGS@
-PTHREAD_CFLAGS ?= @PTHREAD_CFLAGS@
-CAIRO_LIBS ?= @CAIRO_LIBS@
 GTK_CFLAGS ?= @GTK_CFLAGS@
-sharedstatedir ?= @sharedstatedir@
-am__include ?= @am__include@
-OBJEXT ?= @OBJEXT@
-PKG_CONFIG ?= @PKG_CONFIG@
-ICE_CFLAGS ?= @ICE_CFLAGS@
-sysconfdir ?= @sysconfdir@
-htmldir ?= @htmldir@
-PC_REQUIRES ?= @PC_REQUIRES@
-HAVE_SUN ?= @HAVE_SUN@
-GENCAT ?= @GENCAT@
-MOWGLI_LIBS ?= @MOWGLI_LIBS@
-PACKAGE_STRING ?= @PACKAGE_STRING@
-INTLOBJS ?= @INTLOBJS@
-sbindir ?= @sbindir@
-EFFECT_PLUGIN_DIR ?= @EFFECT_PLUGIN_DIR@
-CP ?= @CP@
-SET_MAKE ?= @SET_MAKE@
-DEPDIR ?= @DEPDIR@
-PLUGIN_CFLAGS ?= @PLUGIN_CFLAGS@
-ECHO_C ?= @ECHO_C@
-SM_LIBS ?= @SM_LIBS@
-USE_X86ASM ?= @USE_X86ASM@
-USE_INCLUDED_LIBINTL ?= @USE_INCLUDED_LIBINTL@
-psdir ?= @psdir@
-SHARED_SUFFIX ?= @SHARED_SUFFIX@
-LIBMCS_CFLAGS ?= @LIBMCS_CFLAGS@
-BUILD_INCLUDED_LIBINTL ?= @BUILD_INCLUDED_LIBINTL@
-oldincludedir ?= @oldincludedir@
-MSGFMT ?= @MSGFMT@
-TR ?= @TR@
-TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
-ac_ct_CXX ?= @ac_ct_CXX@
-USE_DBUS ?= @USE_DBUS@
-ARCH_DEFINES ?= @ARCH_DEFINES@
-CAIRO_CFLAGS ?= @CAIRO_CFLAGS@
-LTLIBICONV ?= @LTLIBICONV@
-build_vendor ?= @build_vendor@
-LIB_PREFIX ?= @LIB_PREFIX@
-host_cpu ?= @host_cpu@
 GTK_LIBS ?= @GTK_LIBS@
-PACKAGE ?= @PACKAGE@
-mandir ?= @mandir@
-GLIBC21 ?= @GLIBC21@
-target_alias ?= @target_alias@
-DBUS_SERVICES_DIR ?= @DBUS_SERVICES_DIR@
-LTLIBINTL ?= @LTLIBINTL@
-PLUGIN_CPPFLAGS ?= @PLUGIN_CPPFLAGS@
-LIBAUDCLIENT_LDFLAGS ?= @LIBAUDCLIENT_LDFLAGS@
-PACKAGE_NAME ?= @PACKAGE_NAME@
-DEBUG ?= @DEBUG@
-ECHO_T ?= @ECHO_T@
-am__quote ?= @am__quote@
-LIB_SUFFIX ?= @LIB_SUFFIX@
-LIBOBJS ?= @LIBOBJS@
-ac_ct_CC ?= @ac_ct_CC@
-PANGO_LIBS ?= @PANGO_LIBS@
-PACKAGE_VERSION ?= @PACKAGE_VERSION@
-LDFLAGS_RPATH ?= @LDFLAGS_RPATH@
+ICE_CFLAGS ?= @ICE_CFLAGS@
 ICE_LIBS ?= @ICE_LIBS@
-INTLBISON ?= @INTLBISON@
-LN_S ?= @LN_S@
-INSTALL_LIB ?= @INSTALL_LIB@
-USE_CHARDET ?= @USE_CHARDET@
-GTHREAD_CFLAGS ?= @GTHREAD_CFLAGS@
-GREP ?= @GREP@
-host_vendor ?= @host_vendor@
-build_os ?= @build_os@
-INSTALL_DATA ?= @INSTALL_DATA@
-PANGO_CFLAGS ?= @PANGO_CFLAGS@
-datarootdir ?= @datarootdir@
-MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
-plugindir ?= @plugindir@
-CXX ?= @CXX@
-RM ?= @RM@
-INSTALL_PROGRAM ?= @INSTALL_PROGRAM@
-PLUGIN_LDFLAGS ?= @PLUGIN_LDFLAGS@
-VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@
-IMPLIB_LIBS ?= @IMPLIB_LIBS@
-MSGMERGE ?= @MSGMERGE@
-INTLLIBS ?= @INTLLIBS@
-PROG_IMPLIB_LDFLAGS ?= @PROG_IMPLIB_LDFLAGS@
-host_os ?= @host_os@
-exec_prefix ?= @exec_prefix@
-HAVE_SOLARIS ?= @HAVE_SOLARIS@
-EGREP ?= @EGREP@
-AUDACIOUS_PATH ?= @AUDACIOUS_PATH@
-ARCH_X86 ?= @ARCH_X86@
-VERSION ?= @VERSION@
+LIBGUESS_CFLAGS ?= @LIBGUESS_CFLAGS@
+LIBGUESS_LIBS ?= @LIBGUESS_LIBS@
+PTHREAD_CFLAGS ?= @PTHREAD_CFLAGS@
+PTHREAD_LIBS ?= @PTHREAD_LIBS@
+REGEX_CFLAGS ?= @REGEX_CFLAGS@
+REGEX_LIBS ?= @REGEX_LIBS@
+SM_CFLAGS ?= @SM_CFLAGS@
+SM_LIBS ?= @SM_LIBS@