Makefile distribution updates

svn path=/trunk/boinc/; revision=1335
This commit is contained in:
Karl Chen 2003-06-08 00:49:48 +00:00
parent ad4c7c9b76
commit 879617f4f8
19 changed files with 223 additions and 169 deletions

View File

@ -1,6 +1,7 @@
## $Id$
SUBDIRS = RSAEuro db lib api apps client sched
## set by configure
SUBDIRS = $(TOP_SUBDIRS)
###########################################################################
# The rest of the rules below deal with making .tar.gz, .tar.bz2, and .zip
@ -21,7 +22,7 @@ EXTRA_DIST = \
test/*input test/*.inc \
INSTALL LICENSE
NOT_IN_CLIENT_TARBALL = db doc html_ops html_user lib stripchart sched test tools api
NOT_IN_CLIENT_TARBALL = @NOT_IN_CLIENT_TARBALL@
distdir_client = $(PACKAGE)_client-$(VERSION)
@ -30,10 +31,14 @@ am__remove_distdir_client = \
|| { find $(distdir_client) -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr $(distdir_client); }; }
# create the client distribution by using the full distribution minus certain
# files and chaging one line in the configure script.
distdir-client: distdir
rm -fr $(distdir_client)
mv $(distdir) $(distdir_client)
cd $(distdir_client) && rm -r $(NOT_IN_CLIENT_TARBALL) && cd ..
cd $(distdir_client) && perl -pie 's/^CLIENT_DISTRIBUTION=0$/CLIENT_DISTRIBUTION=1/' configure && cd ..
client-dist-gzip: distdir-client-client
$(AMTAR) chof - $(distdir_client) | GZIP=$(GZIP_ENV) gzip -c >$(distdir_client).tar.gz

View File

@ -74,6 +74,8 @@ LTLIBOBJS = @LTLIBOBJS@
MAJOR_VERSION = @MAJOR_VERSION@
MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
NOT_IN_CLIENT_TARBALL = @NOT_IN_CLIENT_TARBALL@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -86,6 +88,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOP_SUBDIRS = @TOP_SUBDIRS@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@ -130,7 +133,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = RSAEuro db lib api apps client sched
SUBDIRS = $(TOP_SUBDIRS)
###########################################################################
@ -152,8 +155,6 @@ EXTRA_DIST = \
INSTALL LICENSE
NOT_IN_CLIENT_TARBALL = db doc html_ops html_user lib stripchart sched test tools api
distdir_client = $(PACKAGE)_client-$(VERSION)
am__remove_distdir_client = \
@ -577,10 +578,14 @@ uninstall-info: uninstall-info-recursive
uninstall-info-am uninstall-info-recursive uninstall-recursive
# create the client distribution by using the full distribution minus certain
# files and chaging one line in the configure script.
distdir-client: distdir
rm -fr $(distdir_client)
mv $(distdir) $(distdir_client)
cd $(distdir_client) && rm -r $(NOT_IN_CLIENT_TARBALL) && cd ..
cd $(distdir_client) && perl -pie 's/^CLIENT_DISTRIBUTION=0$/CLIENT_DISTRIBUTION=1/' configure && cd ..
client-dist-gzip: distdir-client-client
$(AMTAR) chof - $(distdir_client) | GZIP=$(GZIP_ENV) gzip -c >$(distdir_client).tar.gz
@ -607,7 +612,8 @@ dist-client dist-client-all: distdir-client
dist-all: dist-client-all
dist-hook:
rm -rf `find $(distdir) -name CVS`
rm -rf `find $(distdir) -name CVS -prune`
rm -rf `find $(distdir) -name .backup -prune -o -name *~`
cd $(distdir)/win_build && perl -pi.bak -e 'tr /\r//d' boinc.dsw */*.dsp
.PHONY: distdir-client client-dist-gzip client-dist-gzip2 client-dist-zip \

View File

@ -33,9 +33,9 @@ CPPFLAGS = -g -Wall \
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA: $(top_srcdir)/RSAEuro/source/librsaeuro.a
LIBRSA = $(top_srcdir)/RSAEuro/source/librsaeuro.a
$(top_srcdir)/RSAEuro/source/librsaeuro.a:
$(LIBRSA):
cd $(top_srcdir)/RSAEuro/source; ${MAKE} librsaeuro.a
.PHONY: LIBRSA

103
aclocal.m4 vendored
View File

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.7.5 -*- Autoconf -*-
# generated automatically by aclocal 1.7 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
@ -16,7 +16,7 @@
# This macro actually does too much some checks are only needed if
# your package does certain things. But this isn't really a big deal.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@ -34,7 +34,14 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 10
# serial 8
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
AC_PREREQ([2.54])
@ -79,8 +86,8 @@ m4_ifval([$2],
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
_AM_IF_OPTION([no-define],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
@ -101,7 +108,6 @@ AM_PROG_INSTALL_STRIP
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
@ -124,16 +130,7 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
# loop where config.status creates the headers, so we can generate
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
$1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright 2002 Free Software Foundation, Inc.
@ -163,7 +160,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.7.5])])
[AM_AUTOMAKE_VERSION([1.7])])
# Helper functions for option handling. -*- Autoconf -*-
@ -449,42 +446,9 @@ fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# -*- Autoconf -*-
# Copyright (C) 2003 Free Software Foundation, Inc.
# serial 4 -*- Autoconf -*-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 1
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
[rm -rf .tst 2>/dev/null
mkdir .tst 2>/dev/null
if test -d .tst; then
am__leading_dot=.
else
am__leading_dot=_
fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
# serial 5 -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -576,17 +540,11 @@ AC_CACHE_CHECK([dependency style of $depcc],
if depmode=$depmode \
source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
>/dev/null 2>conftest.err &&
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# (even with -Werror). So we grep stderr for any message
# that says an option was ignored.
if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
done
@ -608,8 +566,16 @@ AM_CONDITIONAL([am__fastdep$1], [
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
[rm -f .deps 2>/dev/null
mkdir .deps 2>/dev/null
if test -d .deps; then
DEPDIR=.deps
else
# MS-DOS does not allow filenames that begin with a dot.
DEPDIR=_deps
fi
rmdir .deps 2>/dev/null
AC_SUBST([DEPDIR])
])
@ -713,7 +679,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -738,9 +704,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
doit:
@echo done
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
@ -768,9 +733,9 @@ if test "$am__include" = "#"; then
_am_result=BSD
fi
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
AC_MSG_RESULT([$_am_result])
AC_SUBST(am__include)
AC_SUBST(am__quote)
AC_MSG_RESULT($_am_result)
rm -f confinc confmf
])

View File

@ -6,3 +6,5 @@ EXTRA_PROGRAMS = api_app api_test
api_app_SOURCES = api_app.C mfile.C boinc_api.C ../lib/parse.C
api_test_SOURCES = boinc_api.C api_test.C ../lib/parse.C
EXTRA_DIST = *.h

View File

@ -158,10 +158,18 @@ RSA_LIBS = \
-lrsaeuro
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA = $(top_srcdir)/RSAEuro/source/librsaeuro.a
EXTRA_PROGRAMS = api_app api_test
api_app_SOURCES = api_app.C mfile.C boinc_api.C ../lib/parse.C
api_test_SOURCES = boinc_api.C api_test.C ../lib/parse.C
EXTRA_DIST = *.h
subdir = api
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -445,13 +453,7 @@ uninstall-am: uninstall-info-am
# -DVERSION=$(VERSION)
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA: $(top_srcdir)/RSAEuro/source/librsaeuro.a
$(top_srcdir)/RSAEuro/source/librsaeuro.a:
$(LIBRSA):
cd $(top_srcdir)/RSAEuro/source; ${MAKE} librsaeuro.a
.PHONY: LIBRSA

View File

@ -158,6 +158,12 @@ RSA_LIBS = \
-lrsaeuro
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA = $(top_srcdir)/RSAEuro/source/librsaeuro.a
bin_PROGRAMS = upper_case concat 1sec
# bin_PROGRAMS = upper_case upper_case_x11 concat 1sec
@ -675,13 +681,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
# -DVERSION=$(VERSION)
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA: $(top_srcdir)/RSAEuro/source/librsaeuro.a
$(top_srcdir)/RSAEuro/source/librsaeuro.a:
$(LIBRSA):
cd $(top_srcdir)/RSAEuro/source; ${MAKE} librsaeuro.a
.PHONY: LIBRSA

View File

@ -39,7 +39,7 @@ boinc_client_SOURCES = \
../lib/crypt.C \
../lib/util.C
#boinc_client_DEPENDENCIES = LIBRSA
boinc_client_DEPENDENCIES = $(LIBRSA)
boinc_client_LDADD = $(RSA_LIBS)
boinc_client_CPPFLAGS = -I $(srcdir)/win
@ -54,10 +54,11 @@ all-local: @CLIENT_BIN_FILENAME@
ln boinc_client @CLIENT_BIN_FILENAME@
## these source files need to be specified because no rule on unix uses them.
EXTRA_DIST = \
mac/*.h mac/*.cpp \
win/*.h win/*.cpp win/*.rc \
win/*.ico win/*.def win/res/*.* \
EXTRA_DIST = \
*.h \
mac/*.h mac/*.cpp \
win/*.h win/*.cpp win/*.rc \
win/*.ico win/*.def win/res/*.* \
translation/language.*
clean-local:

View File

@ -158,6 +158,12 @@ RSA_LIBS = \
-lrsaeuro
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA = $(top_srcdir)/RSAEuro/source/librsaeuro.a
bin_PROGRAMS = boinc_client
EXTRA_PROGRAMS = speed_stats
@ -196,7 +202,7 @@ boinc_client_SOURCES = \
../lib/util.C
#boinc_client_DEPENDENCIES = LIBRSA
boinc_client_DEPENDENCIES = $(LIBRSA)
boinc_client_LDADD = $(RSA_LIBS)
boinc_client_CPPFLAGS = -I $(srcdir)/win
@ -204,9 +210,10 @@ speed_stats_SOURCES = speed_stats.C
speed_stats_CFLAGS = -O6
EXTRA_DIST = \
mac/*.h mac/*.cpp \
win/*.h win/*.cpp win/*.rc \
win/*.ico win/*.def win/res/*.* \
*.h \
mac/*.h mac/*.cpp \
win/*.h win/*.cpp win/*.rc \
win/*.ico win/*.def win/res/*.* \
translation/language.*
subdir = client
@ -243,7 +250,6 @@ am_boinc_client_OBJECTS = boinc_client-main.$(OBJEXT) \
boinc_client-md5.$(OBJEXT) boinc_client-crypt.$(OBJEXT) \
boinc_client-util.$(OBJEXT)
boinc_client_OBJECTS = $(am_boinc_client_OBJECTS)
boinc_client_DEPENDENCIES =
boinc_client_LDFLAGS =
am_speed_stats_OBJECTS = speed_stats.$(OBJEXT)
speed_stats_OBJECTS = $(am_speed_stats_OBJECTS)
@ -1285,13 +1291,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
# -DVERSION=$(VERSION)
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA: $(top_srcdir)/RSAEuro/source/librsaeuro.a
$(top_srcdir)/RSAEuro/source/librsaeuro.a:
$(LIBRSA):
cd $(top_srcdir)/RSAEuro/source; ${MAKE} librsaeuro.a
.PHONY: LIBRSA

23
configure vendored
View File

@ -292,7 +292,7 @@ PACKAGE_VERSION='1.03'
PACKAGE_STRING='BOINC 1.03'
PACKAGE_BUGREPORT=''
ac_unique_file="api/api_test.C"
ac_unique_file="lib/shmem.C"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@ -330,7 +330,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAJOR_VERSION MINOR_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP RANLIB ac_ct_RANLIB EGREP CLIENT_BIN_FILENAME LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAJOR_VERSION MINOR_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP RANLIB ac_ct_RANLIB EGREP CLIENT_BIN_FILENAME NOT_IN_CLIENT_TARBALL TOP_SUBDIRS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -6627,9 +6627,26 @@ fi
CLIENT_BIN_FILENAME=boinc_${MAJOR_VERSION}.${MINOR_VERSION}_$host${EXEEXT}
NOT_IN_CLIENT_TARBALL=db doc html_ops html_user lib stripchart sched test tools api
CLIENT_DISTRIBUTION=0
ac_config_files="$ac_config_files RSAEuro/source/Makefile RSAEuro/Makefile api/Makefile apps/Makefile client/Makefile db/Makefile lib/Makefile sched/Makefile tools/Makefile Makefile test/version.inc"
if "$CLIENT_DISTRIBUTION" = 1 ; then
for dir in $NOT_IN_CLIENT_TARBALL ; do
ac_config_files = `echo "$ac_config_files" | sed 's/$dir^ *//'`
done
TOP_SUBDIRS=RSAEuro lib apps client
else
TOP_SUBDIRS=RSAEuro db lib api apps client sched tools
fi
ac_config_headers="$ac_config_headers config.h"
@ -7346,6 +7363,8 @@ s,@RANLIB@,$RANLIB,;t t
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s,@EGREP@,$EGREP,;t t
s,@CLIENT_BIN_FILENAME@,$CLIENT_BIN_FILENAME,;t t
s,@NOT_IN_CLIENT_TARBALL@,$NOT_IN_CLIENT_TARBALL,;t t
s,@TOP_SUBDIRS@,$TOP_SUBDIRS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF

View File

@ -16,7 +16,7 @@ AC_CANONICAL_SYSTEM
dnl generate .tar.gz, .tar.bz2, .zip
AM_INIT_AUTOMAKE(dist-bzip2 dist-zip)
AC_CONFIG_SRCDIR(api/api_test.C)
AC_CONFIG_SRCDIR(lib/shmem.C)
AC_COPYRIGHT([
The contents of this file are subject to the Mozilla Public License
@ -120,6 +120,10 @@ AC_HEADER_TIME
AC_STRUCT_TM
AC_SUBST(CLIENT_BIN_FILENAME,[boinc_${MAJOR_VERSION}.${MINOR_VERSION}_$host${EXEEXT}])
AC_SUBST(NOT_IN_CLIENT_TARBALL, [db doc html_ops html_user lib stripchart sched test tools api])
dnl this line below is set to =1 in the client distribution
CLIENT_DISTRIBUTION=0
AC_CONFIG_FILES([RSAEuro/source/Makefile
RSAEuro/Makefile
@ -132,7 +136,20 @@ AC_CONFIG_FILES([RSAEuro/source/Makefile
tools/Makefile
Makefile
test/version.inc
])
])
if [ "$CLIENT_DISTRIBUTION" = 1 ]; then
for dir in $NOT_IN_CLIENT_TARBALL ; do
ac_config_files = `echo "$ac_config_files" | sed 's/$dir[^ ]*//'`
done
TOP_SUBDIRS=RSAEuro lib apps client
else
TOP_SUBDIRS=RSAEuro db lib api apps client sched tools
fi
AC_SUBST([TOP_SUBDIRS])
AC_CONFIG_HEADER([config.h])
AC_OUTPUT

View File

@ -1,3 +1,3 @@
## $Id$
EXTRA_DIST = *.sql init_db
EXTRA_DIST = *.sql *.h init_db

View File

@ -130,7 +130,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = *.sql init_db
EXTRA_DIST = *.sql *.h init_db
subdir = db
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

View File

@ -14,12 +14,25 @@ libboinc_a_SOURCES = \
language.C \
util.C \
md5.c \
md5_file.C
md5_file.C \
app_ipc.h \
countries.h \
crypt.h \
error_numbers.h \
filesys.h \
language.h \
md5.h \
md5_file.h \
msg_queue.h \
parse.h \
shmem.h \
synch.h \
util.h
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
synch_test_SOURCES = synch_test.C synch.C
crypt_prog_SOURCES = crypt_prog.C crypt.C md5.c md5_file.C
#crypt_prog_DEPENDENCIES = LIBRSA
crypt_prog_DEPENDENCIES = $(LIBRSA)
crypt_prog_LDADD = $(RSA_LIBS)

View File

@ -158,6 +158,12 @@ RSA_LIBS = \
-lrsaeuro
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA = $(top_srcdir)/RSAEuro/source/librsaeuro.a
bin_PROGRAMS = md5_test shmem_test crypt_prog
EXTRA_PROGRAMS = msg_test synch_test
noinst_LIBRARIES = libboinc.a
@ -170,7 +176,20 @@ libboinc_a_SOURCES = \
language.C \
util.C \
md5.c \
md5_file.C
md5_file.C \
app_ipc.h \
countries.h \
crypt.h \
error_numbers.h \
filesys.h \
language.h \
md5.h \
md5_file.h \
msg_queue.h \
parse.h \
shmem.h \
synch.h \
util.h
md5_test_SOURCES = md5_test.C md5.c md5_file.C
@ -178,7 +197,7 @@ shmem_test_SOURCES = shmem_test.C shmem.C
msg_test_SOURCES = msg_test.C msg_queue.C
synch_test_SOURCES = synch_test.C synch.C
crypt_prog_SOURCES = crypt_prog.C crypt.C md5.c md5_file.C
#crypt_prog_DEPENDENCIES = LIBRSA
crypt_prog_DEPENDENCIES = $(LIBRSA)
crypt_prog_LDADD = $(RSA_LIBS)
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -200,7 +219,6 @@ PROGRAMS = $(bin_PROGRAMS)
am_crypt_prog_OBJECTS = crypt_prog.$(OBJEXT) crypt.$(OBJEXT) \
md5.$(OBJEXT) md5_file.$(OBJEXT)
crypt_prog_OBJECTS = $(am_crypt_prog_OBJECTS)
crypt_prog_DEPENDENCIES =
crypt_prog_LDFLAGS =
am_md5_test_OBJECTS = md5_test.$(OBJEXT) md5.$(OBJEXT) \
md5_file.$(OBJEXT)
@ -558,13 +576,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
# -DVERSION=$(VERSION)
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA: $(top_srcdir)/RSAEuro/source/librsaeuro.a
$(top_srcdir)/RSAEuro/source/librsaeuro.a:
$(LIBRSA):
cd $(top_srcdir)/RSAEuro/source; ${MAKE} librsaeuro.a
.PHONY: LIBRSA

View File

@ -17,10 +17,17 @@ cgi_SOURCES = \
server_types.C \
sched_util.C \
config.C \
../db/boinc_db.C \
../db/boinc_db.C \
../lib/shmem.C \
../lib/util.C \
../lib/parse.C
../lib/parse.C \
assimilate_handler.h \
config.h \
handle_request.h \
main.h \
sched_shmem.h \
sched_util.h \
server_types.h
cgi_LDADD = $(MYSQL_LIBS)
@ -58,7 +65,7 @@ file_upload_handler_SOURCES = \
../lib/md5.c \
../lib/md5_file.C
#file_upload_handler_DEPENDENCIES = LIBRSA
file_upload_handler_DEPENDENCIES = $(LIBRSA)
file_upload_handler_LDADD = $(RSA_LIBS)
validate_test_SOURCES = \
@ -106,7 +113,7 @@ make_work_SOURCES = \
../lib/md5.c \
../lib/crypt.C
#make_work_DEPENDENCIES = LIBRSA
make_work_DEPENDENCIES = $(LIBRSA)
make_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
timeout_check_SOURCES = \
@ -122,7 +129,7 @@ timeout_check_SOURCES = \
../tools/backend_lib.C \
../tools/process_result_template.C
#timeout_check_DEPENDENCIES = LIBRSA
timeout_check_DEPENDENCIES = $(LIBRSA)
timeout_check_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
db_dump_SOURCES = \
@ -164,6 +171,6 @@ fcgi_SOURCES = \
../lib/md5_file.C \
../tools/process_result_template.C
#fcgi_DEPENDENCIES = LIBRSA
fcgi_DEPENDENCIES = $(LIBRSA)
fcgi_CPPFLAGS = -include /usr/local/include/fcgi_stdio.h -D_USING_FCGI_
fcgi_LDADD = $(RSA_LIBS) -lfcgi -lfcgi++ $(MYSQL_LIBS)

View File

@ -158,6 +158,12 @@ RSA_LIBS = \
-lrsaeuro
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA = $(top_srcdir)/RSAEuro/source/librsaeuro.a
bin_PROGRAMS = cgi feeder show_shmem file_upload_handler
noinst_PROGRAMS = \
@ -174,10 +180,17 @@ cgi_SOURCES = \
server_types.C \
sched_util.C \
config.C \
../db/boinc_db.C \
../db/boinc_db.C \
../lib/shmem.C \
../lib/util.C \
../lib/parse.C
../lib/parse.C \
assimilate_handler.h \
config.h \
handle_request.h \
main.h \
sched_shmem.h \
sched_util.h \
server_types.h
cgi_LDADD = $(MYSQL_LIBS)
@ -219,7 +232,7 @@ file_upload_handler_SOURCES = \
../lib/md5_file.C
#file_upload_handler_DEPENDENCIES = LIBRSA
file_upload_handler_DEPENDENCIES = $(LIBRSA)
file_upload_handler_LDADD = $(RSA_LIBS)
validate_test_SOURCES = \
@ -271,7 +284,7 @@ make_work_SOURCES = \
../lib/crypt.C
#make_work_DEPENDENCIES = LIBRSA
make_work_DEPENDENCIES = $(LIBRSA)
make_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
timeout_check_SOURCES = \
@ -288,7 +301,7 @@ timeout_check_SOURCES = \
../tools/process_result_template.C
#timeout_check_DEPENDENCIES = LIBRSA
timeout_check_DEPENDENCIES = $(LIBRSA)
timeout_check_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
db_dump_SOURCES = \
@ -334,7 +347,7 @@ fcgi_SOURCES = \
../tools/process_result_template.C
#fcgi_DEPENDENCIES = LIBRSA
fcgi_DEPENDENCIES = $(LIBRSA)
fcgi_CPPFLAGS = -include /usr/local/include/fcgi_stdio.h -D_USING_FCGI_
fcgi_LDADD = $(RSA_LIBS) -lfcgi -lfcgi++ $(MYSQL_LIBS)
subdir = sched
@ -376,7 +389,6 @@ am_fcgi_OBJECTS = fcgi-handle_request.$(OBJEXT) fcgi-main.$(OBJEXT) \
fcgi-parse.$(OBJEXT) fcgi-crypt.$(OBJEXT) fcgi-md5.$(OBJEXT) \
fcgi-md5_file.$(OBJEXT) fcgi-process_result_template.$(OBJEXT)
fcgi_OBJECTS = $(am_fcgi_OBJECTS)
fcgi_DEPENDENCIES =
fcgi_LDFLAGS =
am_feeder_OBJECTS = feeder.$(OBJEXT) sched_shmem.$(OBJEXT) \
sched_util.$(OBJEXT) config.$(OBJEXT) boinc_db.$(OBJEXT) \
@ -394,7 +406,6 @@ am_file_upload_handler_OBJECTS = file_upload_handler.$(OBJEXT) \
sched_util.$(OBJEXT) config.$(OBJEXT) crypt.$(OBJEXT) \
util.$(OBJEXT) parse.$(OBJEXT) md5.$(OBJEXT) md5_file.$(OBJEXT)
file_upload_handler_OBJECTS = $(am_file_upload_handler_OBJECTS)
file_upload_handler_DEPENDENCIES =
file_upload_handler_LDFLAGS =
am_make_work_OBJECTS = make_work.$(OBJEXT) sched_util.$(OBJEXT) \
config.$(OBJEXT) boinc_db.$(OBJEXT) backend_lib.$(OBJEXT) \
@ -402,7 +413,6 @@ am_make_work_OBJECTS = make_work.$(OBJEXT) sched_util.$(OBJEXT) \
parse.$(OBJEXT) md5_file.$(OBJEXT) md5.$(OBJEXT) \
crypt.$(OBJEXT)
make_work_OBJECTS = $(am_make_work_OBJECTS)
make_work_DEPENDENCIES =
make_work_LDFLAGS =
am_show_shmem_OBJECTS = show_shmem.$(OBJEXT) sched_shmem.$(OBJEXT) \
sched_util.$(OBJEXT) config.$(OBJEXT) boinc_db.$(OBJEXT) \
@ -422,7 +432,6 @@ am_timeout_check_OBJECTS = timeout_check.$(OBJEXT) sched_util.$(OBJEXT) \
crypt.$(OBJEXT) backend_lib.$(OBJEXT) \
process_result_template.$(OBJEXT)
timeout_check_OBJECTS = $(am_timeout_check_OBJECTS)
timeout_check_DEPENDENCIES =
timeout_check_LDFLAGS =
am_update_stats_OBJECTS = boinc_db.$(OBJEXT) parse.$(OBJEXT) \
util.$(OBJEXT) sched_util.$(OBJEXT) config.$(OBJEXT) \
@ -1274,13 +1283,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
# -DVERSION=$(VERSION)
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA: $(top_srcdir)/RSAEuro/source/librsaeuro.a
$(top_srcdir)/RSAEuro/source/librsaeuro.a:
$(LIBRSA):
cd $(top_srcdir)/RSAEuro/source; ${MAKE} librsaeuro.a
.PHONY: LIBRSA

View File

@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.incl
bin_PROGRAMS = create_work add country_select
create_work_SOURCES = \
create_work_SOURCES = \
create_work.C \
backend_lib.C \
process_result_template.C \
@ -12,10 +12,11 @@ create_work_SOURCES = \
../lib/md5.c \
../lib/parse.C \
../lib/util.C \
../db/boinc_db.C \
../lib/crypt.C
../db/boinc_db.C \
../lib/crypt.C \
backend_lib.h
#create_work_DEPENDENCIES = LIBRSA
create_work_DEPENDENCIES = $(LIBRSA)
create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
add_SOURCES = \
@ -27,9 +28,10 @@ add_SOURCES = \
../lib/parse.C \
../lib/util.C \
../db/boinc_db.C \
../lib/crypt.C
../lib/crypt.C \
backend_lib.h
#add_DEPENDENCIES = LIBRSA
add_DEPENDENCIES = $(LIBRSA)
add_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
country_select_SOURCES = country_select.C ../lib/countries.C

View File

@ -158,6 +158,12 @@ RSA_LIBS = \
-lrsaeuro
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA = $(top_srcdir)/RSAEuro/source/librsaeuro.a
bin_PROGRAMS = create_work add country_select
create_work_SOURCES = \
@ -168,11 +174,12 @@ create_work_SOURCES = \
../lib/md5.c \
../lib/parse.C \
../lib/util.C \
../db/boinc_db.C \
../lib/crypt.C
../db/boinc_db.C \
../lib/crypt.C \
backend_lib.h
#create_work_DEPENDENCIES = LIBRSA
create_work_DEPENDENCIES = $(LIBRSA)
create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
add_SOURCES = \
@ -184,10 +191,11 @@ add_SOURCES = \
../lib/parse.C \
../lib/util.C \
../db/boinc_db.C \
../lib/crypt.C
../lib/crypt.C \
backend_lib.h
#add_DEPENDENCIES = LIBRSA
add_DEPENDENCIES = $(LIBRSA)
add_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
country_select_SOURCES = country_select.C ../lib/countries.C
@ -204,7 +212,6 @@ am_add_OBJECTS = add.$(OBJEXT) backend_lib.$(OBJEXT) \
md5.$(OBJEXT) parse.$(OBJEXT) util.$(OBJEXT) boinc_db.$(OBJEXT) \
crypt.$(OBJEXT)
add_OBJECTS = $(am_add_OBJECTS)
add_DEPENDENCIES =
add_LDFLAGS =
am_country_select_OBJECTS = country_select.$(OBJEXT) countries.$(OBJEXT)
country_select_OBJECTS = $(am_country_select_OBJECTS)
@ -216,7 +223,6 @@ am_create_work_OBJECTS = create_work.$(OBJEXT) backend_lib.$(OBJEXT) \
md5.$(OBJEXT) parse.$(OBJEXT) util.$(OBJEXT) boinc_db.$(OBJEXT) \
crypt.$(OBJEXT)
create_work_OBJECTS = $(am_create_work_OBJECTS)
create_work_DEPENDENCIES =
create_work_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@ -683,13 +689,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
# -DVERSION=$(VERSION)
# -pedantic
# this is useful as a dependency to make sure librsaeuro gets compiled before
# programs linking to it:
LIBRSA: $(top_srcdir)/RSAEuro/source/librsaeuro.a
$(top_srcdir)/RSAEuro/source/librsaeuro.a:
$(LIBRSA):
cd $(top_srcdir)/RSAEuro/source; ${MAKE} librsaeuro.a
.PHONY: LIBRSA