From c8d09966cf0267c1e86e3339628f8b54ac74887a Mon Sep 17 00:00:00 2001 From: Reinhard Prix Date: Thu, 29 Sep 2005 11:56:28 +0000 Subject: [PATCH] Install header-files necessary for building workunit-generator externally linked to BOINC. svn path=/trunk/boinc/; revision=8313 --- checkin_notes | 8 ++++++++ db/Makefile.am | 9 ++++++++- db/db_base.h | 2 +- lib/Makefile.am | 28 +++++++++++++++------------- sched/Makefile.am | 15 ++++++++++++--- 5 files changed, 44 insertions(+), 18 deletions(-) diff --git a/checkin_notes b/checkin_notes index 7d55a8af79..ceef228ca0 100755 --- a/checkin_notes +++ b/checkin_notes @@ -12330,3 +12330,11 @@ Rom 28 Sept 2005 Rom 28 Sept 2005 (staging) - Tag for 5.1.5 release, all platforms boinc_core_release_5_1_5 + +Reinhard 29 Sept 2005 + - Install header-files necessary for building workunit-generator externally linked to BOINC. + + db/Makefile.am + db/db_base.h + lib/Makefile.am + sched/Makefile.am diff --git a/db/Makefile.am b/db/Makefile.am index f2a254012f..5cd2925bc6 100644 --- a/db/Makefile.am +++ b/db/Makefile.am @@ -1,3 +1,10 @@ ## $Id$ -EXTRA_DIST = constraints.sql schema.sql boinc_db.h db_base.h mysql.h init_db +## install header-files with prefix-subdir BOINC/ to avoid name-conflicts +includedir = ${prefix}/include/BOINC/ + +## the following headers need to be installed +include_HEADERS = boinc_db.h db_base.h + +## other stuff to go into the distribution +EXTRA_DIST = constraints.sql schema.sql mysql.h init_db diff --git a/db/db_base.h b/db/db_base.h index 1124e9c875..a6809910bb 100644 --- a/db/db_base.h +++ b/db/db_base.h @@ -20,7 +20,7 @@ #ifndef _DB_BASE_ #define _DB_BASE_ -#include "mysql.h" +#include // if SQL columns are not 'not null', you must use these safe_atoi, safe_atof // instead of atoi, atof, since the strings returned by MySQL may be NULL. diff --git a/lib/Makefile.am b/lib/Makefile.am index dc362f23a2..0c98b1d268 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -58,19 +58,21 @@ libboinc_a_SOURCES = \ shmem.C \ util.C -include_HEADERS = \ - app_ipc.h \ - boinc_win.h \ - diagnostics.h \ - exception.h \ - filesys.h \ - hostinfo.h \ - mfile.h \ - miofile.h \ - parse.h \ - prefs.h \ - proxy_info.h \ - util.h +include_HEADERS = \ + app_ipc.h \ + boinc_win.h \ + diagnostics.h \ + exception.h \ + filesys.h \ + hostinfo.h \ + mfile.h \ + miofile.h \ + parse.h \ + prefs.h \ + proxy_info.h \ + util.h \ + msg_log.h \ + crypt.h ## install header-files with prefix-subdir BOINC/ to avoid name-conflicts includedir = ${prefix}/include/BOINC/ diff --git a/sched/Makefile.am b/sched/Makefile.am index 4da3b8ba4a..d12ffb5134 100644 --- a/sched/Makefile.am +++ b/sched/Makefile.am @@ -53,12 +53,9 @@ EXTRA_DIST = \ fcgi_stdio.h \ handle_request.h \ main.h \ - sched_config.h \ sched_locality.h \ - sched_msgs.h \ sched_send.h \ sched_shmem.h \ - sched_util.h \ server_types.h \ start \ validate_util.h @@ -76,6 +73,18 @@ cgi_SOURCES = \ server_types.C \ ../lib/synch.C + +## install header-files with prefix-subdir BOINC/ to avoid name-conflicts +includedir = ${prefix}/include/BOINC/ + +## install only headers that are meant for exporting the API !! +include_HEADERS = \ + sched_config.h \ + sched_msgs.h \ + sched_util.h \ + ../tools/backend_lib.h + + cgi_DEPENDENCIES = $(LIB_SCHED) feeder_SOURCES = \