From c32503b9cffdb31090ec229443e42cdfc0b4dc73 Mon Sep 17 00:00:00 2001 From: Karl Chen Date: Wed, 11 Jun 2003 22:42:42 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=1369 --- Makefile.incl | 9 ++++----- api/Makefile.am | 23 +++++++++++++++++++++-- api/Makefile.in | 34 +++++++++++++++++----------------- client/Makefile.in | 38 +++++++++++++++++++------------------- configure | 26 +++++++++++++------------- 5 files changed, 74 insertions(+), 56 deletions(-) diff --git a/Makefile.incl b/Makefile.incl index 33c240bdb3..350aabab9c 100644 --- a/Makefile.incl +++ b/Makefile.incl @@ -14,7 +14,10 @@ RSA_LIBS = \ -L$(top_builddir)/RSAEuro/source \ -lrsaeuro -CPPFLAGS = -g -Wall \ +AM_CFLAGS = -g -Wall +AM_CXXFLAGS = -g -Wall + +AM_CPPFLAGS = \ -DHOSTTYPE=\"@host@\" \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/api \ @@ -27,10 +30,6 @@ CPPFLAGS = -g -Wall \ -I$(MYSQL_INCLUDES3) \ -include $(top_srcdir)/config.h - # -DVERSION=$(VERSION) - -# -pedantic - # this is useful as a dependency to make sure librsaeuro gets compiled before # programs linking to it: LIBRSA = $(top_builddir)/RSAEuro/source/librsaeuro.a diff --git a/api/Makefile.am b/api/Makefile.am index 02647aac90..c327763961 100644 --- a/api/Makefile.am +++ b/api/Makefile.am @@ -2,9 +2,28 @@ include $(top_srcdir)/Makefile.incl +noinst_LIBRARIES = libboinc_api.a + +libboinc_api_a_SOURCES = \ + boinc_api.C \ + boinc_api.h \ + graphics_api.C \ + graphics_api.h \ + graphics_data.C \ + graphics_data.h \ + gutil.h \ + mac_app_opengl.h \ + mac_carbon_gl.h \ + mfile.C \ + reduce.h \ + x_opengl.C \ + x_opengl.h \ + ../lib/util.C \ + ../lib/shmem.C \ + ../lib/parse.C \ + ../lib/app_ipc.C + 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 diff --git a/api/Makefile.in b/api/Makefile.in index 889ea8b965..bffbceef75 100644 --- a/api/Makefile.in +++ b/api/Makefile.in @@ -51,20 +51,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_BIN_FILENAME = @CLIENT_BIN_FILENAME@ CPP = @CPP@ - -CPPFLAGS = -g -Wall \ - -DHOSTTYPE=\"@host@\" \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/api \ - -I$(top_srcdir)/db \ - -I$(top_srcdir)/RSAEuro/source \ - -I$(top_srcdir)/client \ - -I$(top_srcdir)/tools \ - -I$(MYSQL_INCLUDES) \ - -I$(MYSQL_INCLUDES2) \ - -I$(MYSQL_INCLUDES3) \ - -include $(top_srcdir)/config.h - +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -162,7 +149,22 @@ RSA_LIBS = \ -lrsaeuro -# -pedantic +AM_CFLAGS = -g -Wall +AM_CXXFLAGS = -g -Wall + +AM_CPPFLAGS = \ + -DHOSTTYPE=\"@host@\" \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/api \ + -I$(top_srcdir)/db \ + -I$(top_srcdir)/RSAEuro/source \ + -I$(top_srcdir)/client \ + -I$(top_srcdir)/tools \ + -I$(MYSQL_INCLUDES) \ + -I$(MYSQL_INCLUDES2) \ + -I$(MYSQL_INCLUDES3) \ + -include $(top_srcdir)/config.h + # this is useful as a dependency to make sure librsaeuro gets compiled before # programs linking to it: @@ -455,8 +457,6 @@ uninstall-am: uninstall-info-am tags uninstall uninstall-am uninstall-info-am - # -DVERSION=$(VERSION) - $(LIBRSA): cd $(top_builddir)/RSAEuro/source; ${MAKE} librsaeuro.a # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/client/Makefile.in b/client/Makefile.in index 6ca95902b9..e68cc5197f 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -51,20 +51,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_BIN_FILENAME = @CLIENT_BIN_FILENAME@ CPP = @CPP@ - -CPPFLAGS = -g -Wall \ - -DHOSTTYPE=\"@host@\" \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/api \ - -I$(top_srcdir)/db \ - -I$(top_srcdir)/RSAEuro/source \ - -I$(top_srcdir)/client \ - -I$(top_srcdir)/tools \ - -I$(MYSQL_INCLUDES) \ - -I$(MYSQL_INCLUDES2) \ - -I$(MYSQL_INCLUDES3) \ - -include $(top_srcdir)/config.h - +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -162,7 +149,22 @@ RSA_LIBS = \ -lrsaeuro -# -pedantic +AM_CFLAGS = -g -Wall +AM_CXXFLAGS = -g -Wall + +AM_CPPFLAGS = \ + -DHOSTTYPE=\"@host@\" \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/api \ + -I$(top_srcdir)/db \ + -I$(top_srcdir)/RSAEuro/source \ + -I$(top_srcdir)/client \ + -I$(top_srcdir)/tools \ + -I$(MYSQL_INCLUDES) \ + -I$(MYSQL_INCLUDES2) \ + -I$(MYSQL_INCLUDES3) \ + -include $(top_srcdir)/config.h + # this is useful as a dependency to make sure librsaeuro gets compiled before # programs linking to it: @@ -208,10 +210,10 @@ boinc_client_SOURCES = \ boinc_client_DEPENDENCIES = $(LIBRSA) boinc_client_LDADD = $(RSA_LIBS) -boinc_client_CPPFLAGS = -I $(srcdir)/win +boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) speed_stats_SOURCES = speed_stats.C -speed_stats_CFLAGS = -O6 +speed_stats_CFLAGS = -O6 $(AM_CFLAGS) EXTRA_DIST = \ *.h \ @@ -1293,8 +1295,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-info-am - # -DVERSION=$(VERSION) - $(LIBRSA): cd $(top_builddir)/RSAEuro/source; ${MAKE} librsaeuro.a diff --git a/configure b/configure index 2180c36d48..7c4795f9d0 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.9 . +# From configure.ac Revision: 1.11 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for BOINC 1.03. +# Generated by GNU Autoconf 2.57 for BOINC 1.04. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -288,8 +288,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='BOINC' PACKAGE_TARNAME='boinc' -PACKAGE_VERSION='1.03' -PACKAGE_STRING='BOINC 1.03' +PACKAGE_VERSION='1.04' +PACKAGE_STRING='BOINC 1.04' PACKAGE_BUGREPORT='' ac_unique_file="lib/shmem.C" @@ -807,7 +807,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures BOINC 1.03 to adapt to many kinds of systems. +\`configure' configures BOINC 1.04 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -874,7 +874,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of BOINC 1.03:";; + short | recursive ) echo "Configuration of BOINC 1.04:";; esac cat <<\_ACEOF @@ -962,7 +962,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -BOINC configure 1.03 +BOINC configure 1.04 generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -998,7 +998,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by BOINC $as_me 1.03, which was +It was created by BOINC $as_me 1.04, which was generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1691,7 +1691,7 @@ fi # Define the identity of the package. PACKAGE='boinc' - VERSION='1.03' + VERSION='1.04' cat >>confdefs.h <<_ACEOF @@ -1824,9 +1824,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -MAJOR_VERSION=`echo 1.03 | sed 's/\..*//'` +MAJOR_VERSION=`echo 1.04 | sed 's/\..*//'` -MINOR_VERSION=`echo 1.03 | sed 's/.*\.//'` +MINOR_VERSION=`echo 1.04 | sed 's/.*\.//'` @@ -7050,7 +7050,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by BOINC $as_me 1.03, which was +This file was extended by BOINC $as_me 1.04, which was generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7113,7 +7113,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -BOINC config.status 1.03 +BOINC config.status 1.04 configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"