Commit 1f2d65bc authored by Eric J. Korpela's avatar Eric J. Korpela

- Makefiles:

    added client/scripts to default client build
    removed sea from the default clientgui build
    added locale/client to the default clientgui build
    moved installed headers from $(includedir) to $(pkgincludedir) which
       is $(includedir)/boinc by default.
    removed redefinitions of $(includedir) from Makefiles.
- configure:
    added locale/client/Makefile to AC_CONFIG_FILES


svn path=/trunk/boinc/; revision=15300
parent 249407f5
......@@ -13,11 +13,11 @@ if ENABLE_SERVER
endif
if ENABLE_CLIENT
CLIENT_SUBDIRS = client
CLIENT_SUBDIRS = client client/scripts
endif
if BUILD_CLIENTGUI
CLIENTGUI_SUBDIRS = clientgui sea
CLIENTGUI_SUBDIRS = clientgui locale/client
endif
# ORDER MATTERS below. One must build dependencies FIRST, then things
......@@ -33,8 +33,7 @@ EXTRA_DIST = \
stripchart \
INSTALL
includedir = ${prefix}/include/BOINC
include_HEADERS = \
pkginclude_HEADERS = \
config.h \
version.h
......
......@@ -44,11 +44,8 @@ libboinc_api_a_SOURCES = $(api_files)
libboinc_graphics2_a_SOURCES = $(graphics2_files)
libboinc_graphics2_a_CPPFLAGS = -I$(top_srcdir)/lib
## 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 = \
pkginclude_HEADERS = \
boinc_api.h \
graphics2.h \
gutil.h
......
......@@ -4383,3 +4383,27 @@ Eric May 27 2008
BOINC Manager.po (renamed BOINC-Manager.po)
BOINC Manager.mo (renamed BOINC-Manager.mo)
Eric May 27 2008
- Makefiles:
added client/scripts to default client build
removed sea from the default clientgui build
added locale/client to the default clientgui build
moved installed header from $(includedir) to $(pkgincludedir) which
is $(includedir)/boinc by default.
removed redefinitions of $(includedir) from makefiles.
- configure:
added locale/client/Makefile to AC_CONFIG_FILES
configure.ac
Makefile.am
api/
Makefile.am
db/
Makefile.am
sched/
Makefile.am
lib/
Makefile.am
zip/
Makefile.am
......@@ -670,6 +670,7 @@ AC_CONFIG_FILES([
doc/Makefile
doc/manpages/Makefile
lib/Makefile
locale/client/Makefile
Makefile
py/Boinc/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
py/Boinc/Makefile
......
## $Id$
## 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
pkginclude_HEADERS = boinc_db.h db_base.h
## other stuff to go into the distribution
EXTRA_DIST = constraints.sql schema.sql init_db
......@@ -81,7 +81,7 @@ libboinc_a_SOURCES = \
unix_util.C \
$(mac_sources)
include_HEADERS = \
pkginclude_HEADERS = \
app_ipc.h \
boinc_win.h \
common_defs.h \
......@@ -102,9 +102,6 @@ include_HEADERS = \
str_util.h \
util.h
## install header-files with prefix-subdir BOINC/ to avoid name-conflicts
includedir = ${prefix}/include/BOINC/
md5_test_SOURCES = md5_test.C md5.c md5_file.C
shmem_test_SOURCES = shmem_test.C shmem.C
msg_test_SOURCES = msg_test.C msg_queue.C
......
......@@ -88,11 +88,8 @@ census_SOURCES = \
hr.C \
hr_info.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 = \
pkginclude_HEADERS = \
sched_config.h \
sched_msgs.h \
sched_util.h \
......
......@@ -9,9 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/zlib -I$(top_srcdir)/lib -I$(top_srcdir)/zip -I$(
##noinst_PROGRAMS = test
lib_LIBRARIES = libboinc_zip.a
## install header-files with prefix-subdir BOINC/ to avoid name-conflicts
includedir = ${prefix}/include/BOINC/
include_HEADERS = boinc_zip.h
pkginclude_HEADERS = boinc_zip.h
libboinc_zip_a_SOURCES = boinc_zip.cpp \
./unzip/apihelp.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment