[gimp-perl] Makefile.PL's were putting libs before .o. Bug 726930

[Kevin Cozens <kcozens src gnome org>]

commit 073a8503705058d5d4d9c5b08dfc293621de0f68
Author: Ed J <m8r-35s8eo mailinator com>
Date:   Sun Mar 23 17:36:40 2014 +0000

    Makefile.PL's were putting libs before .o. Bug 726930

 Gimp/Makefile.PL |    9 +--------
 Makefile.PL      |    3 ---
 UI/Makefile.PL   |   22 ++++------------------
 3 files changed, 5 insertions(+), 29 deletions(-)
---
diff --git a/Gimp/Makefile.PL b/Gimp/Makefile.PL
index 5070cb2..6bdf555 100644
--- a/Gimp/Makefile.PL
+++ b/Gimp/Makefile.PL
@@ -4,7 +4,7 @@ do '../config.pl';
 
 sub MY::const_config {
    my $self = shift;
-   $self->{LDDLFLAGS}="$GIMP_LIBS_NOUI $self->{LDDLFLAGS} $LDFLAGS $LIBS $INTLLIBS";
+   $self->{LDLOADLIBS}="$GIMP_LIBS_NOUI $self->{LDLOADLIBS} $LIBS $INTLLIBS";
    package MY;
    $self->SUPER::const_config(@_);
 }
@@ -21,13 +21,6 @@ sub MY::const_loadlibs {
    $self->SUPER::const_loadlibs(@_);
 }
 
-sub MY::postamble {
-   <<"EOF";
-clean ::
-       test -f Makefile || mv -f Makefile.old Makefile
-EOF
-}
-
 $GIMP_INC_NOUI = "-I../../.. $GIMP_INC_NOUI" if $IN_GIMP;
 
 WriteMakefile(
diff --git a/Makefile.PL b/Makefile.PL
index f92c14a..ee93939 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -200,9 +200,6 @@ tags: .
 setver:
        \$(PERL) -pi -e 's/^(\\s*\\\$\$VERSION\\s*=\\s*).*\$\$/\$\${1}\$(VERSION);/' *.pm Gimp/*.pm UI/*.pm 
Net/*.pm
 
-gimpenums.c: makeenums.pl
-       perl makeenums.pl arrays ~/cvs/gimp/libgimp*/*.h >gimpenums.c
-
 EOF
 }
 
diff --git a/UI/Makefile.PL b/UI/Makefile.PL
index b73cdef..8b04579 100644
--- a/UI/Makefile.PL
+++ b/UI/Makefile.PL
@@ -5,21 +5,9 @@ do '../config.pl';
 
 my $pkg = new ExtUtils::Depends Gimp, Glib, Gtk2;
 
-sub MY::const_config {
-   my $self = shift;
-   $self->{LDDLFLAGS}="$GIMP_LIBS $LDFLAGS $LIBS $self->{LDDLFLAGS}";
-   package MY;
-   $self->SUPER::const_config(@_);
-}
-
 sub MY::const_loadlibs {
    my $self = shift;
-   if ($IN_GIMP) {
-      $self->{LD_RUN_PATH} = join (":",
-         $libdir,
-         split /:/,$self->{LD_RUN_PATH}
-      );
-   }
+   $self->{LD_RUN_PATH} = "$libdir:$self->{LD_RUN_PATH}" if $IN_GIMP;
    package MY;
    $self->SUPER::const_loadlibs(@_);
 }
@@ -28,15 +16,13 @@ $GIMP_INC = "-I../../.. $GIMP_INC" if $IN_GIMP;
 
 # change add_define to add them in here instead
 $pkg->set_inc ("$DEFINE1 $DEFS $INC1 $GIMP_INC $CPPFLAGS $pdl_inc $CFLAGS");
-$pkg->set_libs ("$GIMP_LIBS");
-$pkg->add_pm (
-              'UI.pm'          => '$(INST_LIBDIR)/UI.pm',
-             );
+$pkg->set_libs ($GIMP_LIBS);
+$pkg->add_pm ('UI.pm' => '$(INST_LIBDIR)/UI.pm');
 $pkg->add_typemaps ("$topdir/typemap", @pdl_typemaps);
 
 WriteMakefile(
     'NAME'     => 'Gimp::UI',
     'VERSION_FROM' => '../Gimp.pm',
     'macro'    => { libdir => $libdir, exec_prefix => $exec_prefix, prefix => $prefix },
-    $pkg->get_makefile_vars (),
+    $pkg->get_makefile_vars,
 );