Removed *-config.in files (deprecated).

git-svn-id: svn://localhost/trunk/ardour2@40 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 4 insertions, 473 deletions

diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index 4515e0f4a2..052f0bba82 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -24,7 +24,6 @@
 #include <gtkmm.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/popup_selector.h>
 #include <list>
 
 #include <ardour/types.h>
diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index b0a97f5093..dca998b43b 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -20,13 +20,10 @@
 
 #include <cstdlib>
 #include <cmath>
-
 #include <string>
 
 #include <pbd/error.h>
 
-#include <gtkmm2ext/popup_selector.h>
-
 #include <ardour/session.h>
 #include <ardour/region.h>
 
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index ee124db50f..b313d3b129 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -450,9 +450,9 @@ pane_handler (GdkEventButton* ev, Gtk::Paned* pane)
 		pos = Gtkmm2ext::gtk_paned_get_position (pane->gobj());
 
 		if (dynamic_cast<VPaned*>(pane)) {
-			cmp = pane->height();
+			cmp = pane->get_height();
 		} else {
-			cmp = pane->width();
+			cmp = pane->get_width();
 		}
 
 		/* we have to use approximations here because we can't predict the
@@ -481,9 +481,9 @@ pane_handler (GdkEventButton* ev, Gtk::Paned* pane)
 				pane->set_position (1);
 			} else {
 				if (dynamic_cast<VPaned*>(pane)) {
-					pane->set_position (pane->height());
+					pane->set_position (pane->get_height());
 				} else {
-					pane->set_position (pane->width());
+					pane->set_position (pane->get_width());
 				}
 			}
 		}
diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index a00deba5d2..ad4868d624 100644
--- a/gtk2_ardour/visual_time_axis.h
+++ b/gtk2_ardour/visual_time_axis.h
@@ -24,7 +24,6 @@
 #include <gtkmm.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/popup_selector.h>
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
diff --git a/libs/gtkmm2ext/gtkmm2ext-config.in b/libs/gtkmm2ext/gtkmm2ext-config.in
deleted file mode 100644
index 2744b20c52..0000000000
--- a/libs/gtkmm2ext/gtkmm2ext-config.in
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/bin/sh
-
-af_libs=
-af_cflags=
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-
-
-##
-## Define usage()
-##
-usage()
-{
-        cat <<EOF
-Usage: pbd-config [OPTIONS] [LIBRARIES]
-Options:
-  --cflags      print pre-processor and compiler flags
-  --libs        print library linking information
-  --libs-dirs   only print the -L/-R part of --libs
-  --libs-names  only print the -l part of --libs
-  --help        display this help and exit
-  --macros      print the path to m4 macros
-
-  --prefix[=DIR] 
-  --exec_prefix[=DIR] 
-  --version     output gtkmm2ext version information
-Libraries:
-         gtkmm2ext
-EOF
-        exit $1
-}
-
-##
-## Process options
-##
-parse()
-{
-# we must be called with at least one argument
-if test $# -eq 0; then
-        usage 1 1>&2
-fi
-
-# at least one option should be selected
-case "$1" in
-  --*)
-     ;;
-  *)
-     usage 1 1>&2
-     ;;
-esac
-
-# grab all -- arguments
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) af_optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) af_optarg= ;;
-  esac
-
-  case $1 in
-    --help)
-      usage 0 0>&2
-      ;;
-    --cflags)
-      af_echo_cflags=yes
-      ;;
-    --libs)
-      af_echo_libs_L=yes
-      af_echo_libs_l=yes
-      ;;
-    --libs-dirs)
-      af_echo_libs_L=yes
-      ;;
-    --libs-names)
-      af_echo_libs_l=yes
-      ;;
-    --macros*)
-
-echo -I @prefix@/include/gtkmm2ext/macros
-exit
-
-      ;;
-    --prefix=*)
-      prefix=$af_optarg
-      af_prefix_set=yes
-      ;;
-    --prefix)
-      af_echo_prefix=yes
-      ;;
-    --exec_prefix=*)
-      exec_prefix=$af_optarg
-      af_exec_prefix_set=yes
-      ;;
-    --exec_prefix)
-      af_echo_exec_prefix=yes
-      ;;
-    --version)
-      af_echo_version=yes
-      ;;
-    --*)
-      usage 1 1>&2
-      ;;
-    *)
-      break
-      ;;
-  esac
-  shift
-done
-
-# if we have a default library use it
-if test $# -eq 0; then
-if test "X$af_lib_default" != "X"; then
-  af_lib__AF_LIB_DEFAULT=yes
-  return
-fi
-fi
-
-while test $# -gt 0; do
-  case $1 in
-    gtkmm2ext)
-      af_lib_gtkmm2ext=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-}
-
-print_result()
-{
-if test "X$af_echo_cflags" = "Xyes"; then
-    af_all_flags="$af_cflags"
-fi
-
-if test "X$af_echo_libs_L" = "Xyes" || test "X$af_echo_libs_l" = "Xyes"; then
-    af_all_flags="$af_all_flags $af_libs"
-fi
-
-if test -z "$af_all_flags" || test "X$af_all_flags" = "X "; then
-    exit 1
-fi
-
-# Straight out any possible duplicates, but be careful to
-# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz'
-af_other_flags=
-af_lib_L_flags=
-af_rev_libs=
-for i in $af_all_flags; do
-    case "$i" in
-    # a library, save it for later, in reverse order
-    -l*) af_rev_libs="$i $af_rev_libs" ;;
-    -L*|-R*)
-        if test "X$af_echo_libs_L" = "Xyes"; then
-            case " $af_lib_L_flags " in
-            *\ $i\ *) ;;                              # already there
-            *) af_lib_L_flags="$af_lib_L_flags $i" ;; # add it to output
-            esac 
-        fi;;
-    *)
-        case " $af_other_flags " in
-        *\ $i\ *) ;;                                  # already there
-        *) af_other_flags="$af_other_flags $i" ;;     # add it to output
-        esac ;;
-    esac
-done
-
-af_ord_libs=
-if test "X$af_echo_libs_l" = "Xyes"; then
-    for i in $af_rev_libs; do
-        case " $af_ord_libs " in
-        *\ $i\ *) ;;                          # already there
-        *) af_ord_libs="$i $af_ord_libs" ;;   # add it to output in reverse order
-        esac
-    done
-fi
-
-echo $af_other_flags $af_lib_L_flags $af_ord_libs
-}
-
-##
-## Main Body
-##
-
-parse $*
-
-
-##
-## Initialize names
-##
-
-
-
-
-
-if test "X$af_echo_prefix" = "Xyes"; then
-        echo $prefix
-fi
-
-if test "X$af_echo_exec_prefix" = "Xyes"; then
-        echo $exec_prefix
-fi
-
-if test "X$af_echo_version" = "Xyes"; then
-        echo @LIBGTKMMEXT_VERSION@
-        exit 0
-fi
-
-
-##
-## Libraries
-##
-
-#dummy because this should always be selected
-
-
-if test "@includedir@" != /usr/include ; then
-  includes="-I@includedir@"
-fi
-if test "@libdir@" != /usr/lib ; then
-  libs="-L@libdir@"
-fi
-af_cflags="$af_cflags $includes @GLIB_CFLAGS@ @GTK_CFLAGS@ @GTKMM_CFLAGS@ @SIGC_CFLAGS@ "
-af_libs="$libs -lgtkmm2ext @GLIB_LIBS@ @GTK_LIBS@ @GTKMM_LIBS@ @PBD_LIBS@ @SIGC_LIBS@ $af_libs"
-
-
-
-
-print_result
-
-exit 0
-
diff --git a/libs/pbd3/pbd-config.in b/libs/pbd3/pbd-config.in
deleted file mode 100644
index 4c53125b59..0000000000
--- a/libs/pbd3/pbd-config.in
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/bin/sh
-
-af_libs=
-af_cflags=
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-
-
-##
-## Define usage()
-##
-usage()
-{
-        cat <<EOF
-Usage: pbd-config [OPTIONS] [LIBRARIES]
-Options:
-  --cflags      print pre-processor and compiler flags
-  --libs        print library linking information
-  --libs-dirs   only print the -L/-R part of --libs
-  --libs-names  only print the -l part of --libs
-  --help        display this help and exit
-  --macros      print the path to m4 macros
-
-  --prefix[=DIR] 
-  --exec_prefix[=DIR] 
-  --version     output pbd version information
-Libraries:
-         pbd
-EOF
-        exit $1
-}
-
-##
-## Process options
-##
-parse()
-{
-# we must be called with at least one argument
-if test $# -eq 0; then
-        usage 1 1>&2
-fi
-
-# at least one option should be selected
-case "$1" in
-  --*)
-     ;;
-  *)
-     usage 1 1>&2
-     ;;
-esac
-
-# grab all -- arguments
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) af_optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) af_optarg= ;;
-  esac
-
-  case $1 in
-    --help)
-      usage 0 0>&2
-      ;;
-    --cflags)
-      af_echo_cflags=yes
-      ;;
-    --libs)
-      af_echo_libs_L=yes
-      af_echo_libs_l=yes
-      ;;
-    --libs-dirs)
-      af_echo_libs_L=yes
-      ;;
-    --libs-names)
-      af_echo_libs_l=yes
-      ;;
-    --macros*)
-
-echo -I @prefix@/include/pbd/macros
-exit
-
-      ;;
-    --prefix=*)
-      prefix=$af_optarg
-      af_prefix_set=yes
-      ;;
-    --prefix)
-      af_echo_prefix=yes
-      ;;
-    --exec_prefix=*)
-      exec_prefix=$af_optarg
-      af_exec_prefix_set=yes
-      ;;
-    --exec_prefix)
-      af_echo_exec_prefix=yes
-      ;;
-    --version)
-      af_echo_version=yes
-      ;;
-    --*)
-      usage 1 1>&2
-      ;;
-    *)
-      break
-      ;;
-  esac
-  shift
-done
-
-# if we have a default library use it
-if test $# -eq 0; then
-if test "X$af_lib_default" != "X"; then
-  af_lib__AF_LIB_DEFAULT=yes
-  return
-fi
-fi
-
-while test $# -gt 0; do
-  case $1 in
-    pbd)
-      af_lib_pbd=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-}
-
-print_result()
-{
-if test "X$af_echo_cflags" = "Xyes"; then
-    af_all_flags="$af_cflags"
-fi
-
-if test "X$af_echo_libs_L" = "Xyes" || test "X$af_echo_libs_l" = "Xyes"; then
-    af_all_flags="$af_all_flags $af_libs"
-fi
-
-if test -z "$af_all_flags" || test "X$af_all_flags" = "X "; then
-    exit 1
-fi
-
-# Straight out any possible duplicates, but be careful to
-# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz'
-af_other_flags=
-af_lib_L_flags=
-af_rev_libs=
-for i in $af_all_flags; do
-    case "$i" in
-    # a library, save it for later, in reverse order
-    -l*) af_rev_libs="$i $af_rev_libs" ;;
-    -L*|-R*)
-        if test "X$af_echo_libs_L" = "Xyes"; then
-            case " $af_lib_L_flags " in
-            *\ $i\ *) ;;                              # already there
-            *) af_lib_L_flags="$af_lib_L_flags $i" ;; # add it to output
-            esac 
-        fi;;
-    *)
-        case " $af_other_flags " in
-        *\ $i\ *) ;;                                  # already there
-        *) af_other_flags="$af_other_flags $i" ;;     # add it to output
-        esac ;;
-    esac
-done
-
-af_ord_libs=
-if test "X$af_echo_libs_l" = "Xyes"; then
-    for i in $af_rev_libs; do
-        case " $af_ord_libs " in
-        *\ $i\ *) ;;                          # already there
-        *) af_ord_libs="$i $af_ord_libs" ;;   # add it to output in reverse order
-        esac
-    done
-fi
-
-echo $af_other_flags $af_lib_L_flags $af_ord_libs
-}
-
-##
-## Main Body
-##
-
-parse $*
-
-
-##
-## Initialize names
-##
-
-
-
-
-
-if test "X$af_echo_prefix" = "Xyes"; then
-        echo $prefix
-fi
-
-if test "X$af_echo_exec_prefix" = "Xyes"; then
-        echo $exec_prefix
-fi
-
-if test "X$af_echo_version" = "Xyes"; then
-        echo @LIBPBD_VERSION@
-        exit 0
-fi
-
-
-##
-## Libraries
-##
-
-#dummy because this should always be selected
-
-
-if test "@includedir@" != /usr/include ; then
-  includes="-I@includedir@"
-fi
-if test "@libdir@" != /usr/lib ; then
-  libs="-L@libdir@"
-fi
-af_cflags="$af_cflags $includes @SIGC_CFLAGS@"
-af_libs="$libs -lpbd @PBD_LIBS@ $af_libs"
-
-
-
-
-print_result
-
-exit 0
-