diff --git a/dcapi/boinc/Makefile.am b/dcapi/boinc/Makefile.am index 97881e0f71..ddd335cce9 100644 --- a/dcapi/boinc/Makefile.am +++ b/dcapi/boinc/Makefile.am @@ -3,11 +3,11 @@ lib_LTLIBRARIES = AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) if BUILD_MASTER -lib_LTLIBRARIES += libdc-boinc.la +lib_LTLIBRARIES += libdcapi-boinc.la endif if BUILD_CLIENT -lib_LTLIBRARIES += libdc-client-boinc.la +lib_LTLIBRARIES += libdcapi-client-boinc.la endif pkgconfigdir = ${libdir}/pkgconfig @@ -17,23 +17,23 @@ AM_LDFLAGS = $(BOINC_LDFLAGS) $(GLIB_LIBS) noinst_HEADERS = common_defs.h dc_boinc.h -libdc_boinc_la_SOURCES = \ +libdcapi_boinc_la_SOURCES = \ config.C \ dc.c \ db.C \ events.C \ result.c \ wu.C -libdc_boinc_la_LIBADD = \ - ../common/libdc-common-master.la \ +libdcapi_boinc_la_LIBADD = \ + ../common/libdcapi-common-master.la \ -lsched -lboinc -lcrypto -luuid -lm -libdc_boinc_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOINC_SERVER_CPPFLAGS) -libdc_boinc_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/common/master.sym +libdcapi_boinc_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOINC_SERVER_CPPFLAGS) +libdcapi_boinc_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/common/master.sym -libdc_client_boinc_la_SOURCES = \ +libdcapi_client_boinc_la_SOURCES = \ client.C -libdc_client_boinc_la_LIBADD = \ - ../common/libdc-common-client.la \ +libdcapi_client_boinc_la_LIBADD = \ + ../common/libdcapi-common-client.la \ $(BOINC_CLIENT_LIBS) -libdc_client_boinc_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOINC_CPPFLAGS) -libdc_client_boinc_la_LDFLAGS = -static +libdcapi_client_boinc_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOINC_CPPFLAGS) +libdcapi_client_boinc_la_LDFLAGS = -static diff --git a/dcapi/boinc/dcapi-boinc-client.pc.in b/dcapi/boinc/dcapi-boinc-client.pc.in index 26b0dde56b..78b1e8735d 100644 --- a/dcapi/boinc/dcapi-boinc-client.pc.in +++ b/dcapi/boinc/dcapi-boinc-client.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: DC-API BOINC Client Description: BOINC client implementation for DC-API Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -ldc-client-boinc +Libs: -L${libdir} -ldcapi-client-boinc Libs.private: @BOINC_CLIENT_LIBS@ Cflags: -I${includedir} diff --git a/dcapi/boinc/dcapi-boinc-master.pc.in b/dcapi/boinc/dcapi-boinc-master.pc.in index 05f3e56125..466fff22ee 100644 --- a/dcapi/boinc/dcapi-boinc-master.pc.in +++ b/dcapi/boinc/dcapi-boinc-master.pc.in @@ -7,6 +7,6 @@ Name: DC-API BOINC Master Description: BOINC master implementation for DC-API Version: @PACKAGE_VERSION@ Requires: glib-2.0 uuid -Libs: -L${libdir} -ldc-boinc +Libs: -L${libdir} -ldcapi-boinc Libs.private: @BOINC_SERVER_LIBS@ -lm Cflags: -I${includedir} diff --git a/dcapi/common/Makefile.am b/dcapi/common/Makefile.am index 0e382862f6..0905d6b692 100644 --- a/dcapi/common/Makefile.am +++ b/dcapi/common/Makefile.am @@ -7,21 +7,21 @@ EXTRA_DIST = master.sym if BUILD_MASTER -noinst_LTLIBRARIES += libdc-common-master.la -libdc_common_master_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) -DMASTER -libdc_common_master_la_SOURCES = \ +noinst_LTLIBRARIES += libdcapi-common-master.la +libdcapi_common_master_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) -DMASTER +libdcapi_common_master_la_SOURCES = \ cfg-master.c \ logger.c \ util.c -libdc_common_master_la_LIBADD = $(GLIB_LIBS) +libdcapi_common_master_la_LIBADD = $(GLIB_LIBS) endif if BUILD_CLIENT -noinst_LTLIBRARIES += libdc-common-client.la -libdc_common_client_la_CPPFLAGS = $(AM_CPPFLAGS) -DCLIENT -libdc_common_client_la_SOURCES = \ +noinst_LTLIBRARIES += libdcapi-common-client.la +libdcapi_common_client_la_CPPFLAGS = $(AM_CPPFLAGS) -DCLIENT +libdcapi_common_client_la_SOURCES = \ cfg-client.c \ logger.c \ util.c diff --git a/dcapi/condor/Makefile.am b/dcapi/condor/Makefile.am index 3fec284031..8109e5445c 100644 --- a/dcapi/condor/Makefile.am +++ b/dcapi/condor/Makefile.am @@ -1,11 +1,11 @@ lib_LTLIBRARIES = if BUILD_MASTER -lib_LTLIBRARIES += libdc-condor.la +lib_LTLIBRARIES += libdcapi-condor.la endif if BUILD_CLIENT -lib_LTLIBRARIES += libdc-client-condor.la +lib_LTLIBRARIES += libdcapi-client-condor.la endif pkgconfigdir = ${libdir}/pkgconfig @@ -24,7 +24,7 @@ noinst_HEADERS = condor_common.h \ condor_slave.h \ condor_event.h -libdc_condor_la_SOURCES = condor_master.c \ +libdcapi_condor_la_SOURCES = condor_master.c \ condor_common.c \ condor_wu.c \ condor_managewu.c \ @@ -33,26 +33,26 @@ libdc_condor_la_SOURCES = condor_master.c \ condor_result.c \ condor_event.c -libdc_condor_la_LIBADD = ../common/libdc-common-master.la \ +libdcapi_condor_la_LIBADD = ../common/libdcapi-common-master.la \ $(GLIB_LIBS) \ -lcondorapi -libdc_condor_la_LDFLAGS = -static +libdcapi_condor_la_LDFLAGS = -static -libdc_client_condor_la_SOURCES = condor_slave.c \ +libdcapi_client_condor_la_SOURCES = condor_slave.c \ condor_common.c \ condor_utils.c -libdc_client_condor_la_LIBADD = ../common/libdc-common-client.la -libdc_client_condor_la_LDFLAGS = -static +libdcapi_client_condor_la_LIBADD = ../common/libdcapi-common-client.la +libdcapi_client_condor_la_LDFLAGS = -static #appdir = $(libdir)/dcapi/condor #app_PROGRAMS = tss tm #tss_SOURCES = tss.c tc.c -#tss_LDADD = ../common/libdc-common-client.la libdc-client-condor.la +#tss_LDADD = ../common/libdcapi-common-client.la libdcapi-client-condor.la #tm_SOURCES = tm.c tc.c -#tm_LDADD = ../common/libdc-common-master.la libdc-condor.la -L. -ldl -luuid -lstdc++ +#tm_LDADD = ../common/libdcapi-common-master.la libdcapi-condor.la -L. -ldl -luuid -lstdc++ dd: all ssh root@emma 'make -C /home/staff/drdani/prj/szdg/dcapi/trunk/condor install' diff --git a/dcapi/condor/dcapi-condor-client.pc.in b/dcapi/condor/dcapi-condor-client.pc.in index f327c7b849..24053ceb76 100644 --- a/dcapi/condor/dcapi-condor-client.pc.in +++ b/dcapi/condor/dcapi-condor-client.pc.in @@ -7,5 +7,5 @@ Name: DC-API Condor Client Description: Condor client implementation for DC-API Version: @PACKAGE_VERSION@ Requires.private: glib-2.0 -Libs: -L${libdir} -ldc-client-condor +Libs: -L${libdir} -ldcapi-client-condor Cflags: -I${includedir} diff --git a/dcapi/condor/dcapi-condor-master.pc.in b/dcapi/condor/dcapi-condor-master.pc.in index ead19863db..3f6fddabca 100644 --- a/dcapi/condor/dcapi-condor-master.pc.in +++ b/dcapi/condor/dcapi-condor-master.pc.in @@ -7,5 +7,5 @@ Name: DC-API Condor Master Description: Condor master implementation for DC-API Version: @PACKAGE_VERSION@ Requires.private: glib-2.0 -Libs: -L${libdir} -ldc-condor -lstdc++ -luuid -ldl @CONDOR_LDFLAGS@ -lcondorapi +Libs: -L${libdir} -ldcapi-condor -lstdc++ -luuid -ldl @CONDOR_LDFLAGS@ -lcondorapi Cflags: -I${includedir} diff --git a/dcapi/debian/libdcapi-boinc-dev.install b/dcapi/debian/libdcapi-boinc-dev.install index 7337ecd886..f44673fe98 100644 --- a/dcapi/debian/libdcapi-boinc-dev.install +++ b/dcapi/debian/libdcapi-boinc-dev.install @@ -1,5 +1,5 @@ -debian/tmp/usr/lib/libdc-boinc.a -debian/tmp/usr/lib/libdc-boinc.so -debian/tmp/usr/lib/libdc-client-boinc.a +debian/tmp/usr/lib/libdcapi-boinc.a +debian/tmp/usr/lib/libdcapi-boinc.so +debian/tmp/usr/lib/libdcapi-client-boinc.a debian/tmp/usr/lib/pkgconfig/dcapi-boinc-client.pc debian/tmp/usr/lib/pkgconfig/dcapi-boinc-master.pc diff --git a/dcapi/debian/libdcapi-boinc1.install b/dcapi/debian/libdcapi-boinc1.install index 9cae1902c3..e7c8a228ce 100644 --- a/dcapi/debian/libdcapi-boinc1.install +++ b/dcapi/debian/libdcapi-boinc1.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/libdc-boinc.so.1.0.0 -debian/tmp/usr/lib/libdc-boinc.so.1 +debian/tmp/usr/lib/libdcapi-boinc.so.1.0.0 +debian/tmp/usr/lib/libdcapi-boinc.so.1 diff --git a/dcapi/debian/libdcapi-condor-dev.install b/dcapi/debian/libdcapi-condor-dev.install index ea1a3fab3d..a84b51bc8d 100644 --- a/dcapi/debian/libdcapi-condor-dev.install +++ b/dcapi/debian/libdcapi-condor-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/libdc-client-condor.a -debian/tmp/usr/lib/libdc-condor.a +debian/tmp/usr/lib/libdcapi-client-condor.a +debian/tmp/usr/lib/libdcapi-condor.a debian/tmp/usr/lib/pkgconfig/dcapi-condor-client.pc debian/tmp/usr/lib/pkgconfig/dcapi-condor-master.pc diff --git a/dcapi/debian/libdcapi-local-dev.install b/dcapi/debian/libdcapi-local-dev.install index 663bbe505a..120dc13138 100644 --- a/dcapi/debian/libdcapi-local-dev.install +++ b/dcapi/debian/libdcapi-local-dev.install @@ -1,5 +1,5 @@ -debian/tmp/usr/lib/libdc-client-local.a -debian/tmp/usr/lib/libdc-local.a -debian/tmp/usr/lib/libdc-local.so +debian/tmp/usr/lib/libdcapi-client-local.a +debian/tmp/usr/lib/libdcapi-local.a +debian/tmp/usr/lib/libdcapi-local.so debian/tmp/usr/lib/pkgconfig/dcapi-local-client.pc debian/tmp/usr/lib/pkgconfig/dcapi-local-master.pc diff --git a/dcapi/debian/libdcapi-local1.install b/dcapi/debian/libdcapi-local1.install index 421a46c9bf..efd1cceaa2 100644 --- a/dcapi/debian/libdcapi-local1.install +++ b/dcapi/debian/libdcapi-local1.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/libdc-local.so.1.0.0 -debian/tmp/usr/lib/libdc-local.so.1 +debian/tmp/usr/lib/libdcapi-local.so.1.0.0 +debian/tmp/usr/lib/libdcapi-local.so.1 diff --git a/dcapi/java/Makefile.am b/dcapi/java/Makefile.am index ca8b93551b..c5a83095a2 100644 --- a/dcapi/java/Makefile.am +++ b/dcapi/java/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = $(JAVA_INC) # 1. Java classes # 2. dc-client.jar # 3. jni_proto.h -# 4. libdc-java-client.la +# 4. libdcapi-java-client.la ####################################################################### @@ -72,20 +72,20 @@ $(CLASSDIR)/client/Version.java: $(CLASSDIR)/client/Version.java.in $(top_buildd # Rules for building the JNI part lib_LTLIBRARIES = \ - libdc-java-client.la + libdcapi-java-client.la noinst_HEADERS = util.h BUILT_SOURCES = jni_proto.h jni_export.sym -libdc_java_client_la_SOURCES = \ +libdcapi_java_client_la_SOURCES = \ client.c \ util.c -libdc_java_client_la_LDFLAGS = \ +libdcapi_java_client_la_LDFLAGS = \ -avoid-version \ -release $(PACKAGE_VERSION) \ -export-symbols=jni_export.sym -libdc_java_client_la_LIBADD = \ - $(top_builddir)/boinc/libdc-client-boinc.la -libdc_java_client_la_DEPENDENCIES = jni_export.sym +libdcapi_java_client_la_LIBADD = \ + $(top_builddir)/boinc/libdcapi-client-boinc.la +libdcapi_java_client_la_DEPENDENCIES = jni_export.sym # jni_proto.h contains both the consumer and producer-side JNI prototypes jni_proto.h: $(JARFILES) @@ -104,7 +104,7 @@ jni_export.sym: jni_proto.h install-exec-hook: case $(host_os) in \ darwin*) \ - $(LN_S) -f $(DESTDIR)$(libdir)/libdc-java-client-$(PACKAGE_VERSION).dylib $(DESTDIR)$(libdir)/libdc-java-client-$(PACKAGE_VERSION).jnilib; \ + $(LN_S) -f $(DESTDIR)$(libdir)/libdcapi-java-client-$(PACKAGE_VERSION).dylib $(DESTDIR)$(libdir)/libdcapi-java-client-$(PACKAGE_VERSION).jnilib; \ esac diff --git a/dcapi/java/example/boinc-java-launcher b/dcapi/java/example/boinc-java-launcher index f39a8164cc..10b7aeafed 100644 --- a/dcapi/java/example/boinc-java-launcher +++ b/dcapi/java/example/boinc-java-launcher @@ -6,10 +6,10 @@ set +v -libdc-jre=`sed -n '/^/ s/<[^>]*>//gp' libdc-jre.tar` +libdcapi-jre=`sed -n '/^/ s/<[^>]*>//gp' libdcapi-jre.tar` app-jar=`sed -n '/^/ s/<[^>]*>//gp' Uppercase.jar` -[ -d jre ] || gunzip -c "$libdc-jre" | tar xf - +[ -d jre ] || gunzip -c "$libdcapi-jre" | tar xf - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib export LD_LIBRARY_PATH diff --git a/dcapi/java/jre-boinc/jre_for_boinc_guide.txt b/dcapi/java/jre-boinc/jre_for_boinc_guide.txt index fe7b14faee..d92ae6f2a0 100644 --- a/dcapi/java/jre-boinc/jre_for_boinc_guide.txt +++ b/dcapi/java/jre-boinc/jre_for_boinc_guide.txt @@ -7,7 +7,7 @@ for use in a BOINC infrastructure on Linux clients. i. JRE available at http://java.sun.com/javase/downloads/index.jsp - ii. DC-API for java (libdc-java-client-0.9.so, libdc-boinc-client.so) + ii. DC-API for java (libdcapi-java-client-0.9.so, libdcapi-boinc-client.so) 2. Preparing ------------ @@ -29,7 +29,7 @@ for use in a BOINC infrastructure on Linux clients. ------------------------------------------------- i. The java application on BOINC consists of the following - a. libdc-jre.tar - the jre prepared in part 2. + a. libdcapi-jre.tar - the jre prepared in part 2. b. application.jar - the java application to be run in BOINC c. launcher - script that untars jre and calls java with the jar of the application on the client computer diff --git a/dcapi/local/Makefile.am b/dcapi/local/Makefile.am index 3b74e54ed4..3089b21f04 100644 --- a/dcapi/local/Makefile.am +++ b/dcapi/local/Makefile.am @@ -1,11 +1,11 @@ lib_LTLIBRARIES = if BUILD_MASTER -lib_LTLIBRARIES += libdc-local.la +lib_LTLIBRARIES += libdcapi-local.la endif if BUILD_CLIENT -lib_LTLIBRARIES += libdc-client-local.la +lib_LTLIBRARIES += libdcapi-client-local.la endif pkgconfigdir = ${libdir}/pkgconfig @@ -20,32 +20,32 @@ noinst_HEADERS = \ local_utils.h \ local_wu.h -libdc_local_la_SOURCES = \ +libdcapi_local_la_SOURCES = \ local_master.c \ local_events.c \ local_result.c \ local_utils.c \ local_common.c \ local_wu.c -libdc_local_la_LIBADD = ../common/libdc-common-master.la $(GLIB_LIBS) -luuid -libdc_local_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/common/master.sym +libdcapi_local_la_LIBADD = ../common/libdcapi-common-master.la $(GLIB_LIBS) -luuid +libdcapi_local_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/common/master.sym -libdc_client_local_la_SOURCES = \ +libdcapi_client_local_la_SOURCES = \ local_client.c \ local_utils.c \ local_common.c -libdc_client_local_la_LIBADD = ../common/libdc-common-client.la -libdc_client_local_la_LDFLAGS = -static +libdcapi_client_local_la_LIBADD = ../common/libdcapi-common-client.la +libdcapi_client_local_la_LDFLAGS = -static #appdir = $(libdir)/dcapi/local #app_PROGRAMS = lss lm #lss_SOURCES = ../condor/tss.c ../condor/tc.c -#lss_LDADD = ../common/libdc-common-client.la libdc-client-local.la +#lss_LDADD = ../common/libdcapi-common-client.la libdcapi-client-local.la #lm_SOURCES = ../condor/tm.c ../condor/tc.c -#lm_LDADD = ../common/libdc-common-master.la libdc-local.la -L. -ldl -luuid -lstdc++ +#lm_LDADD = ../common/libdcapi-common-master.la libdcapi-local.la -L. -ldl -luuid -lstdc++ #dd: all install_local diff --git a/dcapi/local/dcapi-local-client.pc.in b/dcapi/local/dcapi-local-client.pc.in index 601336f3d9..811ecc1e2e 100644 --- a/dcapi/local/dcapi-local-client.pc.in +++ b/dcapi/local/dcapi-local-client.pc.in @@ -7,5 +7,5 @@ Name: DC-API Local Client Description: Local client implementation for DC-API Version: @PACKAGE_VERSION@ Requires.private: glib-2.0 -Libs: -L${libdir} -ldc-client-local +Libs: -L${libdir} -ldcapi-client-local Cflags: -I${includedir} diff --git a/dcapi/local/dcapi-local-master.pc.in b/dcapi/local/dcapi-local-master.pc.in index 1637565e4b..718093ab8a 100644 --- a/dcapi/local/dcapi-local-master.pc.in +++ b/dcapi/local/dcapi-local-master.pc.in @@ -7,5 +7,5 @@ Name: DC-API Local Master Description: Local master implementation for DC-API Version: @PACKAGE_VERSION@ Requires: glib-2.0 uuid -Libs: -L${libdir} -ldc-local +Libs: -L${libdir} -ldcapi-local Cflags: -I${includedir} diff --git a/dcapi/win_build/dcapi.vcproj b/dcapi/win_build/dcapi.vcproj index 92df4e3980..76500ac2a8 100644 --- a/dcapi/win_build/dcapi.vcproj +++ b/dcapi/win_build/dcapi.vcproj @@ -88,7 +88,7 @@ @@ -182,7 +182,7 @@ diff --git a/dcapi/win_build/dcapi_2003.vcproj b/dcapi/win_build/dcapi_2003.vcproj index d32ec7a183..b187305b2a 100644 --- a/dcapi/win_build/dcapi_2003.vcproj +++ b/dcapi/win_build/dcapi_2003.vcproj @@ -58,7 +58,7 @@