From 2b23ebd5d0dce2f30d87ff435b45022997646ebf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ji=C5=99=C3=AD=20Filipovi=C4=8D?= <fila@ics.muni.cz>
Date: Mon, 30 Apr 2007 15:36:24 +0000
Subject: [PATCH] Cleared Makefile.

---
 org.glite.jp.primary/Makefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index bc5e69d..a96c95d 100644
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -36,11 +36,6 @@ CLASSADPLUGIN_LIBS:= ${classadslib} -lstdc++
 
 CLASSADPLUGIN_LOBJS:= classad_plugin.lo
 
-ifneq (${expat_prefix},/usr)
-        EXPAT_LIBS:=-L${expat_prefix}/lib
-endif
-EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
-
 GLOBUS_CFLAGS:=-I${globus_prefix}/include/${nothrflavour}
 
 DEBUG:=-g -O0  -DDEBUG
@@ -54,13 +49,17 @@ SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/lib
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
+ifneq (${classads_prefix},/usr)
+	classadslib := -L${classads_prefix}/lib -lclassad
+endif
+
 daemon:=glite-jp-primarystoraged
 example:=jpps-test dag-deps
 ps_prefix:=jpps_
 is_prefix:=jpis_
 sample_jobs:=sample_job_aborted  sample_job_cleared  sample_job_tagged_done  sample_job_waiting
 
-plugins:=glite-jp-ftpdauth.la glite-jp-classad.la glite-jp-sandbox.la glite-jp-dock.la
+plugins:=glite-jp-ftpdauth.la glite-jp-classad.la glite-jp-sandbox.la
 
 HDRS_I=file_plugin.h
 HDRS_S=builtin_plugins.h backend.h feed.h utils.h
@@ -214,8 +213,8 @@ glite-jp-sandbox.la: sandbox_plugin.lo
 glite-jp-ftpdauth.la: ftpd_auth.lo mysql.lo
 	${SOLINK} -o $@ ftpd_auth.lo mysql.lo ${COMMONLIB} ${TRIOLIB} ${MYSQLIB}
 
-glite-jp-dock.la: dock_plugin.lo
-	${SOLINK} -o $@ dock_plugin.lo ${EXPAT_LIBS}
+#glite-jp-classad.lo: classad_plugin.c
+#	${LTCOMPILE} -DPLUGIN_DEBUG -o $@ -c $<
 
 %.lo: %.c
 	${LTCOMPILE} -o $@ -c $<
-- 
1.8.2.3