mirror of https://github.com/BOINC/boinc.git
Removed bzip2 rule; add 'foreign' option to automake through
configure.ac so you don't need to specify when invoking automake manually svn path=/trunk/boinc/; revision=1365
This commit is contained in:
parent
74ca44a6c1
commit
a8eb63cce7
|
@ -1,5 +1,7 @@
|
|||
## $Id$
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
SUBDIRS = RSAEuro db lib api apps client sched tools test
|
||||
|
||||
# Putting a directory name recursively copies the entire contents - the
|
||||
|
|
|
@ -134,6 +134,8 @@ target_cpu = @target_cpu@
|
|||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
SUBDIRS = RSAEuro db lib api apps client sched tools test
|
||||
|
||||
|
||||
|
@ -392,10 +394,6 @@ dist-gzip: distdir
|
|||
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(am__remove_distdir)
|
||||
|
||||
dist-bzip2: distdir
|
||||
$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
|
||||
$(am__remove_distdir)
|
||||
|
||||
dist-zip: distdir
|
||||
-rm -f $(distdir).zip
|
||||
zip -rq $(distdir).zip $(distdir)
|
||||
|
@ -403,7 +401,6 @@ dist-zip: distdir
|
|||
|
||||
dist dist-all: distdir
|
||||
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
|
||||
-rm -f $(distdir).zip
|
||||
zip -rq $(distdir).zip $(distdir)
|
||||
$(am__remove_distdir)
|
||||
|
@ -543,7 +540,7 @@ uninstall-info: uninstall-info-recursive
|
|||
|
||||
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
|
||||
clean-generic clean-recursive ctags ctags-recursive dist \
|
||||
dist-all dist-bzip2 dist-gzip dist-zip distcheck distclean \
|
||||
dist-all dist-gzip dist-zip distcheck distclean \
|
||||
distclean-generic distclean-hdr distclean-recursive \
|
||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||
dvi-am dvi-recursive info info-am info-recursive install \
|
||||
|
|
|
@ -16,7 +16,7 @@ fi
|
|||
|
||||
echo "Bootstrapping configure script and makefiles:"
|
||||
|
||||
aclocal && automake --foreign && autoconf && autoheader
|
||||
aclocal && automake && autoconf && autoheader
|
||||
|
||||
## We don't just run ./configure ourselves here, because the user may not want
|
||||
## to run it, or may want to run with custom parameters.
|
||||
|
|
|
@ -214,7 +214,7 @@ all: all-am
|
|||
.SUFFIXES: .C .o .obj
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.incl $(top_srcdir)/configure.ac $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --foreign api/Makefile
|
||||
$(AUTOMAKE) --gnu api/Makefile
|
||||
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
||||
api_app$(EXEEXT): $(api_app_OBJECTS) $(api_app_DEPENDENCIES)
|
||||
|
|
|
@ -242,7 +242,7 @@ all: all-am
|
|||
.SUFFIXES: .C .o .obj
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.incl $(top_srcdir)/configure.ac $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --foreign apps/Makefile
|
||||
$(AUTOMAKE) --gnu apps/Makefile
|
||||
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
||||
|
||||
|
|
|
@ -316,7 +316,7 @@ all: all-am
|
|||
.SUFFIXES: .C .c .o .obj
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.incl $(top_srcdir)/configure.ac $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --foreign client/Makefile
|
||||
$(AUTOMAKE) --gnu client/Makefile
|
||||
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 1.6 .
|
||||
# From configure.ac Revision: 1.7 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.57 for BOINC 1.03.
|
||||
#
|
||||
|
@ -2644,12 +2644,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
(exit $ac_status); }; }; then
|
||||
for ac_declaration in \
|
||||
''\
|
||||
'#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
'extern "C" void exit (int);' \
|
||||
'void exit (int);' \
|
||||
'#include <stdlib.h>'
|
||||
'void exit (int);'
|
||||
do
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
|
@ -3122,12 +3122,12 @@ else
|
|||
fi
|
||||
for ac_declaration in \
|
||||
''\
|
||||
'#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
'extern "C" void exit (int);' \
|
||||
'void exit (int);' \
|
||||
'#include <stdlib.h>'
|
||||
'void exit (int);'
|
||||
do
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
|
|
|
@ -14,7 +14,8 @@ AC_INIT(BOINC, 1.03)
|
|||
AC_CANONICAL_SYSTEM
|
||||
|
||||
dnl generate .tar.gz, .tar.bz2, .zip
|
||||
AM_INIT_AUTOMAKE(dist-bzip2 dist-zip)
|
||||
dnl AM_INIT_AUTOMAKE(dist-bzip2 dist-zip)
|
||||
AM_INIT_AUTOMAKE(dist-zip)
|
||||
|
||||
AC_CONFIG_SRCDIR(lib/shmem.C)
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ all: all-am
|
|||
.SUFFIXES:
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --foreign db/Makefile
|
||||
$(AUTOMAKE) --gnu db/Makefile
|
||||
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
||||
uninstall-info-am:
|
||||
|
|
|
@ -260,7 +260,7 @@ all: all-am
|
|||
.SUFFIXES: .C .c .o .obj
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.incl $(top_srcdir)/configure.ac $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --foreign tools/Makefile
|
||||
$(AUTOMAKE) --gnu tools/Makefile
|
||||
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
|
|
Loading…
Reference in New Issue