From d7e04abffda72483998d6161c360465c68bb30bd Mon Sep 17 00:00:00 2001 From: "Nate Bargmann, N0NB" Date: Tue, 7 Nov 2006 04:28:26 +0000 Subject: [PATCH] 20061106: Update: Fix distclean bug in bindings Makefile git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2158 7ae35d74-ebe9-4afe-98af-79ac388436b8 --- bindings/Makefile.PL | 21 +++++++++++++-------- bindings/Makefile.am | 12 +++++++----- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/bindings/Makefile.PL b/bindings/Makefile.PL index 89cbd5b98..97531d018 100644 --- a/bindings/Makefile.PL +++ b/bindings/Makefile.PL @@ -1,12 +1,17 @@ +# Builds Hamlib-pl.mk and is invoked from Makefile + use ExtUtils::MakeMaker; WriteMakefile( - 'NAME' => 'Hamlib', - ($] >= 5.005 ? ## Add these new keywords supported since 5.005 - (#ABSTRACT_FROM => 'Hamlib.pm', # retrieve abstract from module - AUTHOR => 'Stephane Fillod') : ()), + 'NAME' => 'Hamlib', + # Add these new keywords supported since 5.005 + ($] >= 5.005 ? + ( + #ABSTRACT_FROM => 'Hamlib.pm', # retrieve abstract from module + AUTHOR => 'Stephane Fillod and the Hamlib Group') : ()), + # should use libtool somehow. Otherwise try -Wl,--rpath - #'LIBS' => ['-lhamlib'], - #'DEFINE' => '', - #'INC' => '', - #'OBJECT' => 'hamlibperl_wrap.o', # link all the C files too + #'LIBS' => ['-lhamlib'], + #'DEFINE' => '', + #'INC' => '', + #'OBJECT' => 'hamlibperl_wrap.o', # link all the C files too ); diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 3cd8a0fc7..75beda4e5 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -19,11 +19,12 @@ hamlibperl_wrap.c: hamlib.swg $(SWIGDEP) Hamlib-pl.mk: $(srcdir)/Makefile.PL test -f Makefile.PL || $(LN_S) $(srcdir)/Makefile.PL Makefile.PL perl `test -f Makefile.PL || echo '$(srcdir)/'`Makefile.PL \ - MAKEFILE=Hamlib-pl.mk \ + MAKEFILE="Hamlib-pl.mk" \ PREFIX="$(prefix)" \ INC="$(INCLUDES)" \ CC="$(CC)" \ - OBJECT="hamlibperl_wrap.o" VERSION="$(PACKAGE_VERSION)" \ + OBJECT="hamlibperl_wrap.o" \ + VERSION="$(PACKAGE_VERSION)" \ LIBS="-lhamlib" all-perl: Hamlib-pl.mk hamlibperl_wrap.c @@ -35,8 +36,8 @@ check-perl: all-perl clean-perl: Hamlib-pl.mk $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk clean -distclean-perl: Hamlib-pl.mk - $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distclean +distclean-perl: ## Hamlib-pl.mk +## $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distclean distcheck-perl: Hamlib-pl.mk $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck @@ -137,7 +138,8 @@ EXTRA_DIST = hamlib.swg ignore.swg rig.swg rotator.swg \ BUILT_SOURCES = hamlibperl_wrap.c hamlibtcl_wrap.c hamlibpy_wrap.c Hamlib.py -DISTCLEANFILES = Hamlib-pl.mk Hamlib-pl.mk.old +## DISTCLEANFILES = Hamlib-pl.mk Hamlib-pl.mk.old +DISTCLEANFILES = Hamlib-pl.mk.old MOSTLYCLEANFILES = hamlibperl_wrap.c Hamlib.pm Hamlib.bs \ hamlibtcl_wrap.c pkgIndex.tcl \