From 2d53308447bdb3da94547109bc1403e7a3c815c4 Mon Sep 17 00:00:00 2001 From: John Criswell Date: Sat, 6 Sep 2003 14:46:19 +0000 Subject: [PATCH] Checkin of autoconf-style object root. Added the AC_CONFIG_MAKEFILE macro to configure akefiles which don't need .in templates. Removed the --with-objroot option. Added commands to configure.ac to configure all of the LLVM Makefiles. Oof. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8378 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/aclocal.m4 | 11 +++ autoconf/configure.ac | 188 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 184 insertions(+), 15 deletions(-) diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4 index f25fea8e7e0..c7083002543 100644 --- a/autoconf/aclocal.m4 +++ b/autoconf/aclocal.m4 @@ -6156,3 +6156,14 @@ if test "$ac_cv_header_mmap_anon" = yes; then fi ]) +# +# Configure a Makefile without clobbering it if it exists and is not out of +# date. This is modified from: +# http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html +#[AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1) +# +AC_DEFUN([AC_CONFIG_MAKEFILE], +[AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1,${srcdir}/autoconf/mkinstalldirs `dirname $1`) +]) + + diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 450f50d48db..34fd90e1334 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -22,6 +22,179 @@ AC_CONFIG_AUX_DIR([autoconf]) dnl Configure a header file AC_CONFIG_HEADERS(include/Config/config.h) +AC_CONFIG_MAKEFILE(Makefile) +AC_CONFIG_MAKEFILE(Makefile.common) +AC_CONFIG_MAKEFILE(Makefile.rules) +AC_CONFIG_MAKEFILE(lib/Makefile) +AC_CONFIG_MAKEFILE(lib/Analysis/Makefile) +AC_CONFIG_MAKEFILE(lib/Analysis/DataStructure/Makefile) +AC_CONFIG_MAKEFILE(lib/Analysis/IPA/Makefile) +AC_CONFIG_MAKEFILE(lib/Analysis/LiveVar/Makefile) +AC_CONFIG_MAKEFILE(lib/AsmParser/Makefile) +AC_CONFIG_MAKEFILE(lib/Bytecode/Makefile) +AC_CONFIG_MAKEFILE(lib/Bytecode/Reader/Makefile) +AC_CONFIG_MAKEFILE(lib/Bytecode/Writer/Makefile) +AC_CONFIG_MAKEFILE(lib/CWriter/Makefile) +AC_CONFIG_MAKEFILE(lib/CodeGen/Makefile) +AC_CONFIG_MAKEFILE(lib/CodeGen/InstrSched/Makefile) +AC_CONFIG_MAKEFILE(lib/CodeGen/InstrSelection/Makefile) +AC_CONFIG_MAKEFILE(lib/CodeGen/ModuloScheduling/Makefile) +AC_CONFIG_MAKEFILE(lib/CodeGen/PostOpts/Makefile) +AC_CONFIG_MAKEFILE(lib/CodeGen/PreOpts/Makefile) +AC_CONFIG_MAKEFILE(lib/CodeGen/RegAlloc/Makefile) +AC_CONFIG_MAKEFILE(lib/CodeGen/SelectionDAG/Makefile) +AC_CONFIG_MAKEFILE(lib/ExecutionEngine/Makefile) +AC_CONFIG_MAKEFILE(lib/ExecutionEngine/Interpreter/Makefile) +AC_CONFIG_MAKEFILE(lib/ExecutionEngine/JIT/Makefile) +AC_CONFIG_MAKEFILE(lib/Support/Makefile) +AC_CONFIG_MAKEFILE(lib/Target/Makefile) +AC_CONFIG_MAKEFILE(lib/Target/Sparc/Makefile) +AC_CONFIG_MAKEFILE(lib/Target/X86/Makefile) +AC_CONFIG_MAKEFILE(lib/Transforms/Makefile) +AC_CONFIG_MAKEFILE(lib/Transforms/Hello/Makefile) +AC_CONFIG_MAKEFILE(lib/Transforms/IPO/Makefile) +AC_CONFIG_MAKEFILE(lib/Transforms/Instrumentation/Makefile) +AC_CONFIG_MAKEFILE(lib/Transforms/Instrumentation/ProfilePaths/Makefile) +AC_CONFIG_MAKEFILE(lib/Transforms/Scalar/Makefile) +AC_CONFIG_MAKEFILE(lib/Transforms/Utils/Makefile) +AC_CONFIG_MAKEFILE(lib/VMCore/Makefile) +AC_CONFIG_MAKEFILE(runtime/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/crtend/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libc/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libg/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libgcc/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libm/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libmalloc/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libucb/Makefile) +AC_CONFIG_MAKEFILE(runtime/libdummy/Makefile) +AC_CONFIG_MAKEFILE(runtime/libtrace/Makefile) +AC_CONFIG_MAKEFILE(test/Makefile) +AC_CONFIG_MAKEFILE(test/Makefile.tests) +AC_CONFIG_MAKEFILE(test/Programs/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/Makefile.programs) +AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.report) +AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.report) +AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.report) +AC_CONFIG_MAKEFILE(test/Programs/TEST.example.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/TEST.nightly.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/TEST.buildrepo.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/TEST.jit.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/TEST.nightly.report) +AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/TEST.jit.report) +AC_CONFIG_MAKEFILE(test/Programs/TEST.typesafe.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.gnuplot) +AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/179.art/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/183.equake/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/188.ammp/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/164.gzip/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/175.vpr/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/176.gcc/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/181.mcf/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/186.crafty/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/197.parser/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/254.gap/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/255.vortex/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/300.twolf/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/LLVMSource/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile.multisrc) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Burg/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Fhourstones/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/01-qbsort/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/03-testtrie/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/04-bisect/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/05-eks/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/08-main/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/09-vor/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/12-IOtest/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/15-trie/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/17-bintr/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/18-imp/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/bh/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/bisort/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/em3d/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/health/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/mst/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/perimeter/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/power/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/treeadd/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/tsp/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/voronoi/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/OptimizerEval/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/anagram/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/bc/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/ft/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/ks/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/yacr2/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/aha/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/llubenchmark/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/sgefa/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/sim/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/Flex/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/Larn/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/Moria-5.5.2/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/Povray31/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/NoSource/m4/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile.singlesrc) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/CustomChecked/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Shootout/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Stanford/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/Makefile) +AC_CONFIG_MAKEFILE(tools/Makefile) +AC_CONFIG_MAKEFILE(tools/analyze/Makefile) +AC_CONFIG_MAKEFILE(tools/as/Makefile) +AC_CONFIG_MAKEFILE(tools/bugpoint/Makefile) +AC_CONFIG_MAKEFILE(tools/dis/Makefile) +AC_CONFIG_MAKEFILE(tools/extract/Makefile) +AC_CONFIG_MAKEFILE(tools/gccas/Makefile) +AC_CONFIG_MAKEFILE(tools/gccld/Makefile) +AC_CONFIG_MAKEFILE(tools/link/Makefile) +AC_CONFIG_MAKEFILE(tools/llc/Makefile) +AC_CONFIG_MAKEFILE(tools/lli/Makefile) +AC_CONFIG_MAKEFILE(tools/opt/Makefile) +AC_CONFIG_MAKEFILE(tools/llee/Makefile) +AC_CONFIG_MAKEFILE(tools/llvm-as/Makefile) +AC_CONFIG_MAKEFILE(tools/llvm-dis/Makefile) +AC_CONFIG_MAKEFILE(utils/Makefile) +AC_CONFIG_MAKEFILE(utils/Burg/Makefile) +AC_CONFIG_MAKEFILE(utils/Burg/Doc/Makefile) +AC_CONFIG_MAKEFILE(utils/TableGen/Makefile) +AC_CONFIG_MAKEFILE(www/docs/Makefile) +AC_CONFIG_MAKEFILE(projects/Makefile) +AC_CONFIG_MAKEFILE(projects/sample/Makefile) +AC_CONFIG_MAKEFILE(projects/sample/Makefile.common) +AC_CONFIG_MAKEFILE(projects/sample/Makefile.config) +AC_CONFIG_MAKEFILE(projects/sample/lib/Makefile) +AC_CONFIG_MAKEFILE(projects/sample/lib/sample/Makefile) +AC_CONFIG_MAKEFILE(projects/sample/tools/Makefile) +AC_CONFIG_MAKEFILE(projects/sample/tools/sample/Makefile) +AC_CONFIG_MAKEFILE(projects/ModuleMaker/Makefile) +AC_CONFIG_MAKEFILE(projects/ModuleMaker/Makefile.common) +AC_CONFIG_MAKEFILE(projects/ModuleMaker/tools/Makefile) +AC_CONFIG_MAKEFILE(projects/ModuleMaker/tools/ModuleMaker/Makefile) dnl ************************************************************************** dnl * Determine which system we are building on @@ -338,21 +511,6 @@ AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPID dnl Location of the purify program AC_ARG_WITH(purify,AC_HELP_STRING([--with-purify],[Location of purify program]),AC_SUBST(PURIFY,[$withval])) -dnl Location for placing object files and built programs, libraries, etc -if test ${USER} -then - if test -d /localhome/${USER} - then - AC_SUBST(OBJROOT,[/localhome/${USER}]) - else - AC_SUBST(OBJROOT,[.]) - fi -else - AC_SUBST(OBJROOT,[.]) -fi - -AC_ARG_WITH(objroot,AC_HELP_STRING([--with-objroot],[Location where object files should be placed (default is .)]),AC_SUBST(OBJROOT,[$withval])) - dnl ************************************************************************** dnl * Configure other software packages (via AC_CONFIG_SUBDIRS) dnl ************************************************************************** -- 2.34.1