From 2310fdd440052ab59d92f27e033cf2bd43ad0721 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 9 Oct 2012 13:39:48 +0000
Subject: [PATCH] Cleanup Makefile and dependencies in jobid.api-cpp.

---
 org.glite.jobid.api-cpp/Makefile                   | 22 +---------------------
 org.glite.jobid.api-cpp/project/debian.control     |  2 +-
 .../project/glite-jobid-api-cpp.spec               |  3 ---
 org.glite.lb/configure                             |  2 +-
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/org.glite.jobid.api-cpp/Makefile b/org.glite.jobid.api-cpp/Makefile
index 23644e5..f543e75 100644
--- a/org.glite.jobid.api-cpp/Makefile
+++ b/org.glite.jobid.api-cpp/Makefile
@@ -18,28 +18,12 @@ version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test
 
-DEBUG:=-g -O0 -Wall
-
-CFLAGS:=${DEBUG} \
-	-I${top_srcdir}/interface -I${top_srcdir}/src \
-	${COVERAGE_FLAGS} \
-	-D_GNU_SOURCE
-
-COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS}
-LINK:=libtool --mode=link ${CC} ${LDFLAGS} 
-LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS}
-INSTALL:=libtool --mode=install install
+INSTALL:=install
 
 SOURCES=interface/*.h Makefile
 
-LIBOBJS:=
 HDRS:=JobId.h
 
-LIBLOBJS:=${LIBOBJS:.o=.lo}
-
-LIB:=
-
 compile all: 
 
 
@@ -47,7 +31,6 @@ check: compile
 #
 
 clean:
-	rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h
 	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
@@ -60,7 +43,4 @@ install:
 stage:
 	${MAKE} install PREFIX=${stagedir} staging=1
 
-%.o: %.c
-	${COMPILE} -o $@ -c $< 
-
 .PHONY: default all compile check install clean distclean dist distcheck
diff --git a/org.glite.jobid.api-cpp/project/debian.control b/org.glite.jobid.api-cpp/project/debian.control
index 8404282..858b9e9 100644
--- a/org.glite.jobid.api-cpp/project/debian.control
+++ b/org.glite.jobid.api-cpp/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-jobid-api-cpp
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), libglite-jobid-api-c-dev, libcppunit-dev, libtool, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), libglite-jobid-api-c-dev
 Standards-Version: 3.9.1
 Section: libs
 Homepage: @URL@
diff --git a/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec b/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
index 9f4a85a..e5ade94 100644
--- a/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
+++ b/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
@@ -7,9 +7,6 @@ License: ASL 2.0
 Vendor: EMI
 Group: Development/Libraries
 BuildRequires: glite-jobid-api-c-devel
-BuildRequires: libtool
-BuildRequires: cppunit-devel
-BuildRequires: pkgconfig
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv: yes
 Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.jobid.api-c/%{version}/src/%{name}-@VERSION@.src.tar.gz
diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index c185274..1471edd 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -623,7 +623,7 @@ BEGIN{
 	'lbjp-common.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B libtool:B pkgconfig:B/ ],
 	'lbjp-common.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap gsoapxx libtool:B pkgconfig:B/ ],
 	'jobid.api-c' =>  [ qw/cppunit:B libtool:B openssl:B pkgconfig:B/ ],
-	'jobid.api-cpp' =>  [ qw/cppunit:B libtool:B pkgconfig:B/ ],
+	'jobid.api-cpp' =>  [ qw// ],
 	'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
 	'jp.client' => [ qw/gsoap libtar globus_essentials:R globus:B pkgconfig:B/ ],
         'jp.doc' => [],
-- 
1.8.2.3