From d477bed028674064333764077b46cd833ae764a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Thu, 17 May 2007 17:35:06 +0000 Subject: [PATCH] clean --- org.glite.lb.client/Makefile | 2 +- org.glite.lb.logger/Makefile | 3 +++ org.glite.lb.proxy/Makefile | 9 +++++---- org.glite.lb.server/Makefile | 9 +++++---- org.glite.lb.ws-interface/Makefile | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 3f28bfc..9f4b867 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -312,7 +312,7 @@ endif ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man1 clean: - rm -rf *.o *.lo .libs *.c *.cpp producer_test + rm -rf *.o *.lo .libs lib* *.c *.cpp producer_test rm -rf ${LIB} ${THRLIB} ${TOOLS} logevent ${PLUSLIB} ${THRPLUSLIB} ${MAN_GZ} rm -rf ${EXAMPLES} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS} diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 59ebe41..d94ccb1 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -220,3 +220,6 @@ ll_test.o: %.o: %.cpp il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest.o event_storeTest.o: %.o: %.cpp ${CXX} ${CFLAGS} ${GLOBUSTHRINC} ${TEST_INC} -c $< -o $@ + +clean: + rm -rf .libs/ *.o *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile index 7335128..2537fbe 100644 --- a/org.glite.lb.proxy/Makefile +++ b/org.glite.lb.proxy/Makefile @@ -112,17 +112,17 @@ LB_PROXY_LIBS:= \ -glite_lb_proxy: lbproxy.o fake_write2rgma.o ${STATIC_LIB_BK} +glite-lb-proxy: lbproxy.o fake_write2rgma.o ${STATIC_LIB_BK} @echo DEBUG: mysql_version=${mysql_version} mysql_prefix=${mysql_prefix} @echo DEBUG: shell: x$(shell echo ${mysql_version} | cut -d. -f1,2)x ${LINK} -o $@ lbproxy.o fake_write2rgma.o ${LB_PROXY_LIBS} -glite_lb_proxy_perf: lbproxy.o fake_write2rgma.o ${STATIC_LIB_BK} +glite-lb-proxy-perf: lbproxy.o fake_write2rgma.o ${STATIC_LIB_BK} ${LINK} -o $@ lbproxy.o fake_write2rgma.o ${LB_PROXY_LIBS} default all: compile -compile: glite_lb_proxy +compile: glite-lb-proxy check: compile -echo No test so far @@ -152,7 +152,7 @@ install: -mkdir -p ${PREFIX}/share/doc/${package}-${version} ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} ${INSTALL} -m 644 ${top_srcdir}/doc/README ${top_srcdir}/doc/README.deploy ${PREFIX}/share/doc/${package}-${version} - ${INSTALL} -m 755 glite_lb_proxy ${PREFIX}/bin/glite-lb-proxy + ${INSTALL} -m 755 glite-lb-proxy ${PREFIX}/bin/glite-lb-proxy ${INSTALL} -m 644 ${top_srcdir}/config/glite-lb-dbsetup-proxy.sql ${PREFIX}/etc ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-proxy @@ -163,6 +163,7 @@ install: clean: + rm -rf *.o .libs glite-lb-proxy %.c: %.c.T rm -f $@ diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 26dabcb..64708c2 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -240,10 +240,10 @@ LIB_OBJS_BK:= \ stored_master.o srv_purge.o server_state.o dump.o lb_authz.o load.o \ notification.o il_notification.o notif_match.o stats.o -glite_lb_bkserverd: ${NSMAP} ${BKSERVER_OBJS} +glite-lb-bkserverd: ${NSMAP} ${BKSERVER_OBJS} ${LINKXX} -o $@ ${BKSERVER_OBJS} ${BKSERVER_LIBS} -glite_lb_bkindex: ${INDEX_OBJS} +glite-lb-bkindex: ${INDEX_OBJS} ${LINKXX} -o $@ ${INDEX_OBJS} ${INDEX_LIBS} glite_lb_plugin.la: ${PLUGIN_LOBJS} @@ -261,7 +261,7 @@ else endif endif -compile: glite_lb_bkserverd glite_lb_bkindex ${STATIC_LIB_BK} ${PLUGIN_LIB} store.c index.c jp_job_attrs.h +compile: glite-lb-bkserverd glite-lb-bkindex ${STATIC_LIB_BK} ${PLUGIN_LIB} store.c index.c jp_job_attrs.h check: compile test.xml test.query @@ -364,7 +364,7 @@ install: -mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} for p in bkserverd bkindex; do \ - ${INSTALL} -m 755 "glite_lb_$$p" "${PREFIX}/bin/glite-lb-$$p"; \ + ${INSTALL} -m 755 "glite-lb-$$p" "${PREFIX}/bin/glite-lb-$$p"; \ done for f in dbsetup.sql dbsetup-migrate2transactions.sql index.conf.template; do \ @@ -390,6 +390,7 @@ install: fi clean: + rm -rf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} test* %.c: %.c.T rm -f $@ diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile index 50f02be..9801c0c 100644 --- a/org.glite.lb.ws-interface/Makefile +++ b/org.glite.lb.ws-interface/Makefile @@ -65,7 +65,7 @@ install: # fi clean: - rm -f *.h + rm -f *.h *.html *.xml *.wsdl %.xml: %.xml.T -- 1.8.2.3