diff options
| author | David Robillard <d@drobilla.net> | 2006-10-05 02:40:43 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-10-05 02:40:43 +0000 |
| commit | 85902db98eb6cbe5587831cc2285b807e667fe74 (patch) | |
| tree | 7fcee7ffcbf7c383144ae3163df964acdba19e2e | |
| parent | 8e38b04941464eb3c9866e274daf27b583df9b0e (diff) | |
| download | raul-85902db98eb6cbe5587831cc2285b807e667fe74.tar.gz raul-85902db98eb6cbe5587831cc2285b807e667fe74.tar.bz2 raul-85902db98eb6cbe5587831cc2285b807e667fe74.zip | |
More build system fixes, everything now builds against the local copy if toplevel scripts are used.
git-svn-id: http://svn.drobilla.net/lad/raul@158 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | raul/Makefile | 22 |
2 files changed, 14 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 3d7cae6..c7c12a2 100644 --- a/configure.ac +++ b/configure.ac @@ -44,8 +44,6 @@ AC_ARG_ENABLE(raptor, if test "$build_raptor" = "yes"; then PKG_CHECK_MODULES(RAPTOR, raptor >= 1.4.0, [], AC_MSG_ERROR([RDF support requires raptor (>= 1.4.0)])) - AC_SUBST(RAPTOR_CFLAGS) - AC_SUBST(RAPTOR_LIBS) fi AM_CONDITIONAL(WITH_RAPTOR, [test "$build_raptor" = "yes"]) @@ -57,8 +55,6 @@ AC_ARG_ENABLE(liblo, if test "$build_liblo" = "yes"; then PKG_CHECK_MODULES(LIBLO, liblo >= 0.22, [], AC_MSG_ERROR([OSC support requires liblo (>= 0.22)])) - AC_SUBST(LIBLO_LIBS) - AC_SUBST(LIBLO_CFLAGS) fi AM_CONDITIONAL(WITH_LIBLO, [test "$build_liblo" = "yes"]) @@ -71,9 +67,12 @@ AC_CONFIG_FILES([raul.pc]) AC_OUTPUT AC_MSG_RESULT([]) +AC_MSG_RESULT([**********************************************************************]) AC_MSG_RESULT([Raul build configuration:]) AC_MSG_RESULT([]) AC_MSG_RESULT([OSC supprt: $build_liblo]) AC_MSG_RESULT([RDF supprt: $build_raptor]) AC_MSG_RESULT([Smart Pointers: $build_smart_pointers]) +AC_MSG_RESULT([**********************************************************************]) +AC_MSG_RESULT([]) diff --git a/raul/Makefile b/raul/Makefile index 6e7ba67..ac1b652 100644 --- a/raul/Makefile +++ b/raul/Makefile @@ -62,21 +62,21 @@ HEADERS = $(raulinclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/dave/code/codesonnet/raul/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /home/dave/code/codesonnet/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/dave/code/codesonnet/raul/missing --run tar -AUTOCONF = ${SHELL} /home/dave/code/codesonnet/raul/missing --run autoconf -AUTOHEADER = ${SHELL} /home/dave/code/codesonnet/raul/missing --run autoheader -AUTOMAKE = ${SHELL} /home/dave/code/codesonnet/raul/missing --run automake-1.9 +AMTAR = ${SHELL} /home/dave/code/codesonnet/missing --run tar +AUTOCONF = ${SHELL} /home/dave/code/codesonnet/missing --run autoconf +AUTOHEADER = ${SHELL} /home/dave/code/codesonnet/missing --run autoheader +AUTOMAKE = ${SHELL} /home/dave/code/codesonnet/missing --run automake-1.9 AWK = gawk BOOST_CFLAGS = BOOST_LIBS = CPPFLAGS = CXX = g++ CXXCPP = g++ -E -CXXDEPMODE = depmode=none -CXXFLAGS = -pipe -O2 -march=pentium4 -msse -msse2 -mfpmath=sse -ffast-math -ftree-vectorize -DNDEBUG -finline-functions -fomit-frame-pointer -fmessage-length=139 -fdiagnostics-show-location=every-line +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -O2 -march=athlon64 -fomit-frame-pointer CYGPATH_W = echo DEFS = -DPACKAGE_NAME=\"raul\" -DPACKAGE_TARNAME=\"raul\" -DPACKAGE_VERSION=\"0.0.0\" -DPACKAGE_STRING=\"raul\ 0.0.0\" -DPACKAGE_BUGREPORT=\"drobilla@connect.carleton.ca\" -DPACKAGE=\"raul\" -DVERSION=\"0.0.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_STRDUP=1 -DHAVE_STRERROR=1 DEPDIR = .deps @@ -96,7 +96,7 @@ LIBLO_LIBS = -L/usr/local/lib -llo -lpthread LIBOBJS = LIBS = LTLIBOBJS = -MAKEINFO = ${SHELL} /home/dave/code/codesonnet/raul/missing --run makeinfo +MAKEINFO = ${SHELL} /home/dave/code/codesonnet/missing --run makeinfo OBJEXT = o PACKAGE = raul PACKAGE_BUGREPORT = drobilla@connect.carleton.ca @@ -119,8 +119,8 @@ WITH_LIBLO_TRUE = WITH_RAPTOR_FALSE = # WITH_RAPTOR_TRUE = ac_ct_CXX = g++ -am__fastdepCXX_FALSE = -am__fastdepCXX_TRUE = # +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = am__include = include am__leading_dot = . am__quote = @@ -137,7 +137,7 @@ host_alias = htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = /home/dave/code/codesonnet/raul/install-sh +install_sh = /home/dave/code/codesonnet/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale |