mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=4456
This commit is contained in:
parent
b12f8b062f
commit
483ceaca0b
|
@ -5,6 +5,8 @@
|
|||
|
||||
MYSQL_LIBS = @MYSQL_LIBS@
|
||||
MYSQL_CFLAGS = @MYSQL_CFLAGS@
|
||||
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
||||
PTHREAD_LIBS = @PTHREAD_LIBS@
|
||||
|
||||
RSA_LIBS = \
|
||||
-L$(top_builddir)/RSAEuro/source \
|
||||
|
@ -19,6 +21,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/tools \
|
||||
-I$(top_srcdir)/sched \
|
||||
$(MYSQL_CFLAGS) \
|
||||
$(PTHREAD_CFLAGS) \
|
||||
-include $(top_builddir)/config.h
|
||||
|
||||
# this is useful as a dependency to make sure librsaeuro gets compiled before
|
||||
|
|
|
@ -1106,8 +1106,8 @@ AC_DEFUN([SAH_HEADER_STDCXX],[
|
|||
#
|
||||
# Revision Log:
|
||||
# $Log$
|
||||
# Revision 1.159 2004/10/26 21:50:36 boincadm
|
||||
# version 4.53
|
||||
# Revision 1.160 2004/10/29 04:42:32 korpela
|
||||
# *** empty log message ***
|
||||
#
|
||||
# Revision 1.1 2003/12/11 18:38:24 korpela
|
||||
# Added checked macro files into boinc
|
||||
|
|
|
@ -26,7 +26,7 @@ lib_LIBRARIES = libboinc_api.a libboinc_graphics_api.a
|
|||
libboinc_api_a_SOURCES = $(api_files)
|
||||
|
||||
libboinc_graphics_api_a_SOURCES = $(graphics_api_files)
|
||||
libboinc_graphics_api_a_CPPFLAGS = -I$(top_srcdir)/boincglut/include -I$(top_srcdir)/lib
|
||||
libboinc_graphics_api_a_CPPFLAGS = -I$(top_srcdir)/boincglut/include -I$(top_srcdir)/lib
|
||||
|
||||
## install header-files with prefix-subdir BOINC/ to avoid name-conflicts
|
||||
includedir = ${prefix}/include/BOINC/
|
||||
|
|
|
@ -8,7 +8,7 @@ bin_PROGRAMS = upper_case concat 1sec
|
|||
# when we are ready to build graphics apps on unix:
|
||||
# LDADD = -lm -lGL -lGLU -lpthread -L. -lapp
|
||||
|
||||
LDADD = -L../lib -L../api -lboinc -lboinc_api
|
||||
LDADD = -L../lib -L../api -lboinc -lboinc_api $(PTHREAD_LIBS)
|
||||
|
||||
# upper_case_x11_SOURCES = upper_case_x11.C ../api/x_opengl.C ../api/boinc_api.C ../api/graphics_api.C
|
||||
# upper_case_x11_CPPFLAGS = -DBOINC_APP_GRAPHICS
|
||||
|
|
|
@ -18941,3 +18941,25 @@ David 28 Oct 2004
|
|||
Makefile.old
|
||||
lib/
|
||||
gui_rpc_client.C,h
|
||||
|
||||
Eric 28 Oct 2004
|
||||
- added threading flags and libraries to compile lines.
|
||||
- upload handler now checks for zero length
|
||||
|
||||
Makefile.incl
|
||||
aclocal.m4
|
||||
api/
|
||||
Makefile.am
|
||||
apps/
|
||||
Makefile.am
|
||||
client/
|
||||
Makefile.am
|
||||
clientgui/
|
||||
Makefile.am
|
||||
lib/
|
||||
Makefile.am
|
||||
sched/
|
||||
Makefile.am
|
||||
file_upload_handler.C
|
||||
tools/
|
||||
Makefile.am
|
||||
|
|
|
@ -67,7 +67,7 @@ boinc_client_SOURCES = \
|
|||
|
||||
boinc_client_DEPENDENCIES = $(LIBRSA)
|
||||
boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) -O3
|
||||
boinc_client_LDADD = $(RSA_LIBS)
|
||||
boinc_client_LDADD = $(RSA_LIBS) $(PTHREAD_LIBS)
|
||||
#boinc_client_LDFLAGS = $(STATIC_FLAGS)
|
||||
|
||||
# the following don't do anything
|
||||
|
|
|
@ -35,6 +35,7 @@ boincgui_SOURCES = \
|
|||
../lib/util.C
|
||||
|
||||
boincgui_CPPFLAGS = $(AM_CPPFLAGS) -O3
|
||||
boincgui_LDADD = $(PTHREAD_LIBS)
|
||||
|
||||
all-local: client-bin
|
||||
client-bin: @CLIENT_BIN_FILENAME@
|
||||
|
|
|
@ -14,7 +14,7 @@ EXTRA_PROGRAMS = md5_test shmem_test msg_test
|
|||
|
||||
##LIBS = -lnsl -lsocket
|
||||
gui_test_SOURCES = gui_test.C gui_rpc_client.C gui_rpc_client.h
|
||||
gui_test_LDADD = $(lib_LIBRARIES)
|
||||
gui_test_LDADD = $(lib_LIBRARIES) $(PTHREAD_LIBS)
|
||||
|
||||
lib_LIBRARIES = libboinc.a
|
||||
|
||||
|
@ -82,4 +82,4 @@ shmem_test_SOURCES = shmem_test.C shmem.C
|
|||
msg_test_SOURCES = msg_test.C msg_queue.C
|
||||
crypt_prog_SOURCES = crypt_prog.C crypt.C md5.c md5_file.C
|
||||
crypt_prog_DEPENDENCIES = $(LIBRSA)
|
||||
crypt_prog_LDADD = $(RSA_LIBS)
|
||||
crypt_prog_LDADD = $(RSA_LIBS) $(PTHREAD_LIBS)
|
||||
|
|
|
@ -31,7 +31,7 @@ EXTRA_DIST = start
|
|||
# scripts that 'make install' should put in bindir
|
||||
bin_SCRIPTS = start stop status
|
||||
|
||||
LDADD = -L. -lsched $(MYSQL_LIBS)
|
||||
LDADD = -L. -lsched $(MYSQL_LIBS) $(PTHREAD_LIBS)
|
||||
|
||||
LIB_SCHED = libsched.a
|
||||
|
||||
|
|
|
@ -255,7 +255,7 @@ int handle_file_upload(FILE* in, R_RSA_PUBLIC_KEY& key) {
|
|||
else if (parse_double(buf, "<offset>", offset)) continue;
|
||||
else if (parse_double(buf, "<nbytes>", nbytes)) continue;
|
||||
else if (match_tag(buf, "<data>")) {
|
||||
if (nbytes < 0) {
|
||||
if (nbytes <= 0) {
|
||||
return return_error(ERR_PERMANENT, "nbytes missing or negative");
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
## $Id$
|
||||
|
||||
|
||||
include $(top_srcdir)/Makefile.incl
|
||||
|
||||
|
@ -24,7 +24,7 @@ create_work_SOURCES = \
|
|||
backend_lib.h
|
||||
|
||||
create_work_DEPENDENCIES = $(LIBRSA)
|
||||
create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
|
||||
create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) $(PTHREAD_LIBS)
|
||||
|
||||
sign_executable_SOURCES = \
|
||||
sign_executable.C \
|
||||
|
@ -33,7 +33,7 @@ sign_executable_SOURCES = \
|
|||
../lib/crypt.C
|
||||
|
||||
sign_executable_DEPENDENCIES = $(LIBRSA)
|
||||
sign_executable_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
|
||||
sign_executable_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) $(PTHREAD_LIBS)
|
||||
|
||||
dir_hier_path_SOURCES = \
|
||||
dir_hier_path.C \
|
||||
|
|
Loading…
Reference in New Issue