Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename libraries from libdc-* to libdcapi-* 

Lintian complained about the shared library packages having a different
name than the enclosed libraries. Since nobody has been using the shared
libraries yet, and all software depending on DC-API should get the name
of the libraries from pkg-config, this change is the less distruptive.

git-svn-id: svn+ssh://cvs.lpds.sztaki.hu/var/lib/svn/szdg/dcapi/trunk@2241 a7169a2c-3604-0410-bc95-c702d8d87f7a
This commit is contained in:
gombasg 2009-09-08 13:37:51 +00:00 committed by Adam Visegradi
parent e65c2844cd
commit 85e1529d55
20 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dcapi/boinc/Makefile.am
View File

@ -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

2
dcapi/boinc/dcapi-boinc-client.pc.in
View File

@ -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}

2
dcapi/boinc/dcapi-boinc-master.pc.in
View File

@ -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}

14
dcapi/common/Makefile.am
View File

@ -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

20
dcapi/condor/Makefile.am
View File

@ -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'

2
dcapi/condor/dcapi-condor-client.pc.in
View File

@ -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}

2
dcapi/condor/dcapi-condor-master.pc.in
View File

@ -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}

6
dcapi/debian/libdcapi-boinc-dev.install
View File

@ -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

4
dcapi/debian/libdcapi-boinc1.install
View File

@ -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

4
dcapi/debian/libdcapi-condor-dev.install
View File

@ -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

6
dcapi/debian/libdcapi-local-dev.install
View File

@ -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

4
dcapi/debian/libdcapi-local1.install
View File

@ -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

16
dcapi/java/Makefile.am
View File

@ -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

4
dcapi/java/example/boinc-java-launcher
View File

@ -6,10 +6,10 @@
set +v
libdc-jre=`sed -n '/^<soft_link>/ s/<[^>]*>//gp' libdc-jre.tar`
libdcapi-jre=`sed -n '/^<soft_link>/ s/<[^>]*>//gp' libdcapi-jre.tar`
app-jar=`sed -n '/^<soft_link>/ 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

4
dcapi/java/jre-boinc/jre_for_boinc_guide.txt
View File

@ -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

20
dcapi/local/Makefile.am
View File

@ -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

2
dcapi/local/dcapi-local-client.pc.in
View File

@ -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}

2
dcapi/local/dcapi-local-master.pc.in
View File

@ -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}

4
dcapi/win_build/dcapi.vcproj
View File

@ -88,7 +88,7 @@
<Tool
Name="VCLibrarianTool"
LinkLibraryDependencies="true"
OutputFile="$(OutDir)\libdc-client-boinc.lib"
OutputFile="$(OutDir)\libdcapi-client-boinc.lib"
AdditionalLibraryDirectories="$(OutDir)\"
IgnoreAllDefaultLibraries="false"
/>
@ -182,7 +182,7 @@
<Tool
Name="VCLibrarianTool"
LinkLibraryDependencies="true"
OutputFile="$(OutDir)\libdc-client-boinc-debug.lib"
OutputFile="$(OutDir)\libdcapi-client-boinc-debug.lib"
AdditionalLibraryDirectories="$(OutDir)\"
SuppressStartupBanner="true"
/>

4
dcapi/win_build/dcapi_2003.vcproj
View File

@ -58,7 +58,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies=""
OutputFile="$(OutDir)/libdc-client-boinc_2003.lib"
OutputFile="$(OutDir)/libdcapi-client-boinc_2003.lib"
AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="FALSE"/>
<Tool
@ -129,7 +129,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/libdc-client-boinc-debug_2003.lib"
OutputFile="$(OutDir)/libdcapi-client-boinc-debug_2003.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"