# # # rename "Makefile.am" # to "Makefile.in" # # rename "configure.ac" # to "monotone/configure.ac" # # rename "pcre/pcrepattern.texi" # to "monotone/pcrepattern.texi" # # rename "pcre/pcresyntax.texi" # to "monotone/pcresyntax.texi" # # rename "po" # to "monotone/po" # # add_file "autogen.sh" # content [4e070fb8113bd21a5df06e1662f52d3edd400a2a] # # add_file "configure.ac" # content [cac08fd0d93722586d01648f2ebf7a553edc3fa9] # # add_file "idna/configure.ac" # content [105102f88cea84a6a5f8eac6ef1896ce35273d35] # # add_file "lua/configure.ac" # content [95852a57ea9f647a856137459e2e4a64b60510a7] # # add_file "netxx/configure.ac" # content [f09e94a3c2f1b5dfad5106f0d06f9c2c124549f4] # # add_file "pcre/configure.ac" # content [04d79c5a15950d1a813dc6bd64ca4f89aa7cb412] # # add_file "sqlite/configure.ac" # content [a384a290bbe736d11f60880071681770d16cd3b2] # # patch ".mtn-ignore" # from [48d461ab5590a8e01a5e5b804813bbbd031cdb44] # to [d7787423a1ba8910fc48af560ee285b3a51248a6] # # patch "Makefile.in" # from [16b8929f06616df94a8f75e303fca2b51bbe29a6] # to [d6ca2291497e8bf757fab966c6a25c0437a493af] # # patch "idna/Makefile.am" # from [c9c2823b490ad3bd3b403da2cf19e83de6e06154] # to [9bd29ff33d3a296695d1a01e8148df137e6f4c23] # # patch "lua/Makefile.am" # from [61b054c7bb7aadfed62a711b80c663fc33ec1bd4] # to [46a135c015bdaaaa9023a392a8e389b8510c0d2a] # # patch "monotone/Makefile.am" # from [44107aab2fa94ccae0b6595728d515f3d9277682] # to [952bc35b6676a6eddf36a225dbed347fa54c29ae] # # patch "monotone/configure.ac" # from [a9dcf4eee9172e8ef6e0316bb4727bce462bf3cf] # to [1f7cd71270ba1b6bfe0f387cbb43f79c70ec517e] # # patch "netxx/Makefile.am" # from [762bd5839e15c708a2e8ea03632835e38efa3568] # to [77ae531e6662f3fba9f4fee9e4566a4e2b38f751] # # patch "pcre/Makefile.am" # from [8a97bcc2bfc3278c789c95e16c6794b689f58282] # to [c98bdfd14eec6c05e7dc9d469f5e6adfe3764aac] # # patch "sqlite/Makefile.am" # from [80e44e7d51192dc444870447119e8a51f170f0ae] # to [ef1193d1b936b1f03cbc90f5cc32378ffd79b735] # ============================================================ --- autogen.sh 4e070fb8113bd21a5df06e1662f52d3edd400a2a +++ autogen.sh 4e070fb8113bd21a5df06e1662f52d3edd400a2a @@ -0,0 +1,14 @@ +#! /bin/sh + +# Run this script to regenerate all configure scripts & Makefiles in +# this source directory. Mostly, we use autoreconf, but autoreconf +# does not understand our nested directory structure, so it needs a +# bit of help. Arguments to this will be passed down to autoreconf. +# Note that the botan directory does not have anything needing +# regenerating. + +set -e +autoreconf -i "$@" +for subdir in idna lua monotone netxx pcre sqlite +do (cd $subdir && exec autoreconf -i "$@") +done ============================================================ --- configure.ac cac08fd0d93722586d01648f2ebf7a553edc3fa9 +++ configure.ac cac08fd0d93722586d01648f2ebf7a553edc3fa9 @@ -0,0 +1,46 @@ +# Top-level configuration template for Monotone. +# Process this file with autoconf to produce a configure script. +# Copyright 2008 Zachary Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + +# We do not do any checks here, only record the configure options and +# create the Makefile which will pass them all down to the +# subdirectories. Note that we do not use AC_CONFIG_SUBDIRS, because +# we need to control the arguments to the sub-configures; instead we +# invoke them from the top-level Makefile. + +# FIXME: The AC_INIT line has to be kept in sync with monotone/configure.ac. +AC_PREREQ(2.58) +AC_INIT(monotone, 0.39, address@hidden) +AC_CONFIG_SRCDIR([monotone/monotone.cc]) + +CONFIGARGS="$ac_configure_args" +AC_SUBST(CONFIGARGS) + +# --with-system-foo support goes here +LIBRARIES="botan idna lua netxx pcre sqlite" +AC_SUBST(LIBRARIES) + +# A bunch of Makefile rules need to know whether or not to prepend "../" +# to $(srcdir) when in a subdirectory. It is much easier to figure this +# out here. +case "$srcdir" in + . | ./) subsrcdir=".." ;; + /*) subsrcdir="$srcdir" ;; + *) subsrcdir="../$srcdir" ;; +esac +AC_SUBST(subsrcdir) + +# It is much easier to create the build subdirectories in the same +# breath as the top level Makefile than to deal with Make's bizarro +# behavior when directories are goals. +AC_CONFIG_FILES([Makefile], + [mkdir -p $needed_dirs], + [needed_dirs="$LIBRARIES monotone"]) +AC_OUTPUT ============================================================ --- idna/configure.ac 105102f88cea84a6a5f8eac6ef1896ce35273d35 +++ idna/configure.ac 105102f88cea84a6a5f8eac6ef1896ce35273d35 @@ -0,0 +1,26 @@ +# Stub configuration template for Monotone third-party library directories. +# Process this file with autoconf to produce a configure script. +# Copyright 2008 Zachary Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + +# This file will be replaced by the actual third-party library +# configuration script for all directories where that is practical. +# (It may not be practical for dead-upstream or heavily modified +# third-party libraries, e.g. netxx and idna.) It makes no attempt to +# do anything beyond the bare minimum, just like the associated +# Makefile.am. + +AC_PREREQ(2.58) +AC_INIT(idna, XX, address@hidden) +AM_INIT_AUTOMAKE +AC_CONFIG_AUX_DIR([..]) +AC_CONFIG_MACRO_DIR([../m4]) +AC_CONFIG_SRCDIR([idna.h]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT ============================================================ --- lua/configure.ac 95852a57ea9f647a856137459e2e4a64b60510a7 +++ lua/configure.ac 95852a57ea9f647a856137459e2e4a64b60510a7 @@ -0,0 +1,26 @@ +# Stub configuration template for Monotone third-party library directories. +# Process this file with autoconf to produce a configure script. +# Copyright 2008 Zachary Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + +# This file will be replaced by the actual third-party library +# configuration script for all directories where that is practical. +# (It may not be practical for dead-upstream or heavily modified +# third-party libraries, e.g. netxx and idna.) It makes no attempt to +# do anything beyond the bare minimum, just like the associated +# Makefile.am. + +AC_PREREQ(2.58) +AC_INIT(lua, XX, address@hidden) +AM_INIT_AUTOMAKE +AC_CONFIG_AUX_DIR([..]) +AC_CONFIG_MACRO_DIR([../m4]) +AC_CONFIG_SRCDIR([lua.h]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT ============================================================ --- netxx/configure.ac f09e94a3c2f1b5dfad5106f0d06f9c2c124549f4 +++ netxx/configure.ac f09e94a3c2f1b5dfad5106f0d06f9c2c124549f4 @@ -0,0 +1,26 @@ +# Stub configuration template for Monotone third-party library directories. +# Process this file with autoconf to produce a configure script. +# Copyright 2008 Zachary Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + +# This file will be replaced by the actual third-party library +# configuration script for all directories where that is practical. +# (It may not be practical for dead-upstream or heavily modified +# third-party libraries, e.g. netxx and idna.) It makes no attempt to +# do anything beyond the bare minimum, just like the associated +# Makefile.am. + +AC_PREREQ(2.58) +AC_INIT(netxx, XX, address@hidden) +AM_INIT_AUTOMAKE +AC_CONFIG_AUX_DIR([..]) +AC_CONFIG_MACRO_DIR([../m4]) +AC_CONFIG_SRCDIR([netxx.h]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT ============================================================ --- pcre/configure.ac 04d79c5a15950d1a813dc6bd64ca4f89aa7cb412 +++ pcre/configure.ac 04d79c5a15950d1a813dc6bd64ca4f89aa7cb412 @@ -0,0 +1,26 @@ +# Stub configuration template for Monotone third-party library directories. +# Process this file with autoconf to produce a configure script. +# Copyright 2008 Zachary Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + +# This file will be replaced by the actual third-party library +# configuration script for all directories where that is practical. +# (It may not be practical for dead-upstream or heavily modified +# third-party libraries, e.g. netxx and idna.) It makes no attempt to +# do anything beyond the bare minimum, just like the associated +# Makefile.am. + +AC_PREREQ(2.58) +AC_INIT(pcre, XX, address@hidden) +AM_INIT_AUTOMAKE +AC_CONFIG_AUX_DIR([..]) +AC_CONFIG_MACRO_DIR([../m4]) +AC_CONFIG_SRCDIR([pcre.h]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT ============================================================ --- sqlite/configure.ac a384a290bbe736d11f60880071681770d16cd3b2 +++ sqlite/configure.ac a384a290bbe736d11f60880071681770d16cd3b2 @@ -0,0 +1,26 @@ +# Stub configuration template for Monotone third-party library directories. +# Process this file with autoconf to produce a configure script. +# Copyright 2008 Zachary Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + +# This file will be replaced by the actual third-party library +# configuration script for all directories where that is practical. +# (It may not be practical for dead-upstream or heavily modified +# third-party libraries, e.g. netxx and idna.) It makes no attempt to +# do anything beyond the bare minimum, just like the associated +# Makefile.am. + +AC_PREREQ(2.58) +AC_INIT(sqlite, XX, address@hidden) +AM_INIT_AUTOMAKE +AC_CONFIG_AUX_DIR([..]) +AC_CONFIG_MACRO_DIR([../m4]) +AC_CONFIG_SRCDIR([sqlite3.h]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT ============================================================ --- .mtn-ignore 48d461ab5590a8e01a5e5b804813bbbd031cdb44 +++ .mtn-ignore d7787423a1ba8910fc48af560ee285b3a51248a6 @@ -1,6 +1,6 @@ \.dirstamp$ ^ABOUT-NLS$ -^Makefile(\.in)?$ +/Makefile(\.in)?$ ^aclocal\.m4$ ^build-arch-stamp$ ^build-indep-stamp$ ============================================================ --- Makefile.am 16b8929f06616df94a8f75e303fca2b51bbe29a6 +++ Makefile.in d6ca2291497e8bf757fab966c6a25c0437a493af @@ -1,2 +1,127 @@ -ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = po netxx lua idna botan pcre sqlite monotone +# Top-level driver makefile for Monotone. +# Copyright 2008 Zachary Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + +# The build process for monotone proceeds in two phases. We first +# recurse into all the library directories, invoking their configure +# scripts with options specified on a per-library basis, shared +# libraries disabled, and --prefix set to a staging directory within +# the build tree. We then build all said libraries, and install them +# into that staging directory. +# +# Then we recurse into the program directory and invoke its configure +# script with compiler options set to search the staging directory for +# headers and libraries. The program is then built. +# +# "make check" runs all the libraries' testsuites as well as the +# program's; "make install" installs only the program. +# +# Note that it is necessary to this scheme that we run the +# subdirectory configures from this Makefile rather than with +# AC_CONFIG_SUBDIRS, because we have to manipulate the configure +# arguments to the libraries, and we have to delay running the program +# configure until the libraries are all built and stage-installed. +# +# Support for use of system-provided shared libraries is TODO. + +default: all + +# Autoconf substitution variables - we don't need to know most of the +# standard ones. +CONFIGARGS := @CONFIGARGS@ +LIBRARIES := @LIBRARIES@ +srcdir := @srcdir@ +subsrcdir := @subsrcdir@ +blddir := $(shell pwd) +subdirs := $(LIBRARIES) monotone + +# Most of the "standard targets for users" only recurse into the +# monotone subdirectory. +cmdtgts := all install install-exec install-strip uninstall +doctgts := info dvi pdf ps html +docinsttgts := $(doctgts:%=install-%) $(doctgts:%=uninstall-%) + +$(cmdtgts) $(doctgts) $(docinsttgts): monotone/Makefile + $(MAKE) -C monotone $@ + +# The clean targets recurse into all active libraries as well as the +# monotone subdir. This is, alas, harder than it ought to be. + +cleantgts := clean distclean mostlyclean maintainer-clean +subcleantgts := $(foreach d,$(subdirs),$(patsubst %,$(d)/%,$(cleantgts))) + +$(cleantgts):: %: $(foreach d,$(subdirs),$(d)/%) + +# If there's no Makefile in a build subdirectory, skip it when cleaning. +$(subcleantgts): + [ ! -f $(@D)/Makefile ] \ + || $(MAKE) -C $(@D) $(@F) + +# Cleanout rules have a little extra work to do at top level. +# (This is why double-colon rules are in use.) +$(cleantgts):: + rm -rf libinst + +# I don't agree with the GNU standard that says maintainer-clean +# shouldn't delete the configure script, but consistency is more +# important than principle. This target should delete the build +# subdirectories (which are created by config.status) only if they are +# empty (which they should be if and only if the build directory does +# not match the source directory). We cannot count on the GNU rmdir +# extension --ignore-fail-on-non-empty, so just ignore its results. +distclean maintainer-clean:: + rm -rf Makefile config.log config.status config.cache \ + autom4te.cache configure.lineno config.status.lineno + -rmdir $(LIBRARIES) monotone + +# The check target also recurses, but should not ignore the absence of a +# subdirectory Makefile. + +subchecktgts := $(foreach d,$(subdirs),$(d)/check) +check: $(subchecktgts) +$(subchecktgts): + $(MAKE) -C $(@D) $(@F) + +# TODO: write 'dist' and 'distcheck' rules. +# I cannot be bothered to support TAGS. + +# This is where the magic happens. All the building targets depend on +# monotone/Makefile, the rule for which runs the configure script in +# the monotone subdirectory. That target in turn depends on +# installation stamp-files for all the active libraries. We do not +# need to mention monotone/config.h in these rules because nothing in +# this Makefile has a direct dependency on them. We also do not +# attempt to put rules for regenerating configure scripts in this +# Makefile. + +LIBSTAMPS := $(foreach d,$(LIBRARIES),libinst/$(d)-stamp) + +monotone/Makefile: $(srcdir)/monotone/configure $(srcdir)/monotone/Makefile.in \ + $(LIBSTAMPS) + cd monotone && $(subsrcdir)/monotone/configure $(CONFIGARGS) \ + CPPFLAGS="-I$(blddir)/libinst/include" \ + LDFLAGS="-L$(blddir)/lib" + +$(LIBSTAMPS): %-stamp: %/Makefile + $(MAKE) -C $(notdir $*) install + touch $@ + +$(patsubst %,%/Makefile, $(filter-out botan,$(LIBRARIES))): + cd $(@D) && $(subsrcdir)/$(@D)/configure --prefix=$(blddir)/libinst \ + --disable-shared --enable-static $(LIBCONFIGARGS) + +# botan is special +botan/Makefile: + cd $(@D) && perl $(subsrcdir)/$(@D)/configure.pl \ + --prefix=$(blddir)/libinst --no-shared + +# Make directives +.SUFFIXES: +.PHONY: default $(cmdtgts) $(doctgts) $(docinsttgts) \ + $(cleantgts) $(subcleantgts) check $(subchecktgts) ============================================================ --- idna/Makefile.am c9c2823b490ad3bd3b403da2cf19e83de6e06154 +++ idna/Makefile.am 9bd29ff33d3a296695d1a01e8148df137e6f4c23 @@ -1,11 +1,12 @@ -AUTOMAKE_OPTIONS=subdir-objects 1.7.1 -ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS=subdir-objects no-dist foreign 1.7.1 -noinst_LIBRARIES = libidna.a +lib_LIBRARIES = libidna.a +include_HEADERS = idna.h punycode.h stringprep.h + libidna_a_SOURCES = \ - gunibreak.h gunicomp.h gunidecomp.h idna.c idna.h idn-int.h \ - nfkc.c profiles.c punycode.c punycode.h rfc3454.c stringprep.c \ - stringprep.h toutf8.c version.c + gunibreak.h gunicomp.h gunidecomp.h idna.c idn-int.h nfkc.c \ + profiles.c punycode.c rfc3454.c stringprep.c toutf8.c \ + version.c libidna_a_CPPFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS) libidna_a_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/.. $(LIB3RDPARTY_CFLAGS) ============================================================ --- lua/Makefile.am 61b054c7bb7aadfed62a711b80c663fc33ec1bd4 +++ lua/Makefile.am 46a135c015bdaaaa9023a392a8e389b8510c0d2a @@ -1,16 +1,16 @@ -AUTOMAKE_OPTIONS=subdir-objects 1.7.1 -ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS=subdir-objects no-dist 1.7.1 -noinst_LIBRARIES = liblua.a +lib_LIBRARIES = liblua.a +include_HEADERS = lua.h luaconf.h lualib.h lauxlib.h liblua_a_SOURCES = \ - lapi.cc lapi.h lauxlib.cc lauxlib.h lbaselib.cc lcode.cc \ - lcode.h ldblib.cc ldebug.cc ldebug.h ldo.cc ldo.h ldump.cc \ - lfunc.cc lfunc.h lgc.cc lgc.h linit.cc liolib.cc llex.cc llex.h \ + lapi.cc lapi.h lauxlib.cc lbaselib.cc lcode.cc lcode.h \ + ldblib.cc ldebug.cc ldebug.h ldo.cc ldo.h ldump.cc lfunc.cc \ + lfunc.h lgc.cc lgc.h linit.cc liolib.cc llex.cc llex.h \ llimits.h lmathlib.cc lmem.cc lmem.h loadlib.cc lobject.cc \ - lobject.h lopcodes.cc lopcodes.h loslib.cc lparser.cc lparser.h \ - lstate.cc lstate.h lstring.cc lstring.h lstrlib.cc ltable.cc \ - ltable.h ltablib.cc ltests.cc ltm.cc ltm.h luaconf.h lua.h \ - lualib.h lundump.cc lundump.h lvm.cc lvm.h lzio.cc lzio.h + lobject.h lopcodes.cc lopcodes.h loslib.cc lparser.cc \ + lparser.h lstate.cc lstate.h lstring.cc lstring.h lstrlib.cc \ + ltable.cc ltable.h ltablib.cc ltests.cc ltm.cc ltm.h \ + lundump.cc lundump.h lvm.cc lvm.h lzio.cc lzio.h liblua_a_CPPFLAGS = liblua_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS) ============================================================ --- monotone/Makefile.am 44107aab2fa94ccae0b6595728d515f3d9277682 +++ monotone/Makefile.am 952bc35b6676a6eddf36a225dbed347fa54c29ae @@ -1,5 +1,5 @@ -AUTOMAKE_OPTIONS=subdir-objects 1.7.1 -ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS=subdir-objects no-dist 1.7.1 +ACLOCAL_AMFLAGS = -I ../m4 CMD_SOURCES = \ cmd.hh cmd_netsync.cc cmd_list.cc cmd_packet.cc cmd_key_cert.cc \ ============================================================ --- configure.ac a9dcf4eee9172e8ef6e0316bb4727bce462bf3cf +++ monotone/configure.ac 1f7cd71270ba1b6bfe0f387cbb43f79c70ec517e @@ -1,13 +1,14 @@ AM_INIT_AUTOMAKE([1.9 tar-ustar std-opti # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.58) AC_INIT(monotone, 0.39, address@hidden) AM_INIT_AUTOMAKE([1.9 tar-ustar std-options]) -AC_CONFIG_SRCDIR([monotone/app_state.cc]) +AC_CONFIG_AUX_DIR([..]) +AC_CONFIG_MACRO_DIR([../m4]) +AC_CONFIG_SRCDIR([app_state.cc]) AM_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile netxx/Makefile lua/Makefile idna/Makefile - pcre/Makefile sqlite/Makefile monotone/Makefile]) +AC_CONFIG_FILES([Makefile]) # Checks for programs. dnl Note: AC_PROG_CC is implied by AM_PROG_CC_C_O and in any case has @@ -158,11 +159,4 @@ AC_SUBST(LIB3RDPARTY_CXXFLAGS) AC_SUBST(LIB3RDPARTY_CFLAGS) AC_SUBST(LIB3RDPARTY_CXXFLAGS) -AC_CONFIG_COMMANDS([botan], -[( - mkdir -p botan - cd botan - ../$srcdir/botan/configure.pl -)]) - AC_OUTPUT ============================================================ --- netxx/Makefile.am 762bd5839e15c708a2e8ea03632835e38efa3568 +++ netxx/Makefile.am 77ae531e6662f3fba9f4fee9e4566a4e2b38f751 @@ -1,7 +1,8 @@ -AUTOMAKE_OPTIONS=subdir-objects 1.7.1 +AUTOMAKE_OPTIONS=subdir-objects no-dist 1.7.1 ACLOCAL_AMFLAGS = -I m4 -noinst_LIBRARIES = libnetxx.a +lib_LIBRARIES = libnetxx.a +include_HEADERS = libnetxx_a_SOURCES = \ accept.cxx accept.h address.cxx address.h common.h compat.h \ datagram.cxx datagram.h datagramserver.cxx datagramserver.h \ ============================================================ --- pcre/Makefile.am 8a97bcc2bfc3278c789c95e16c6794b689f58282 +++ pcre/Makefile.am c98bdfd14eec6c05e7dc9d469f5e6adfe3764aac @@ -1,15 +1,15 @@ AUTOMAKE_OPTIONS=subdir-objects 1.7.1 AUTOMAKE_OPTIONS=subdir-objects 1.7.1 -ACLOCAL_AMFLAGS = -I m4 -noinst_LIBRARIES = libpcre.a +lib_LIBRARIES = libpcre.a +include_HEADERS = pcre.h libpcre_a_SOURCES = \ pcre_chartables.c pcre_compile.c pcre_config.c pcre_config.h \ pcre_dfa_exec.c pcre_exec.c pcre_fullinfo.c pcre_get.c \ - pcre_globals.c pcre.h pcre_info.c pcre_internal.h \ - pcre_maketables.c pcre_newline.c pcre_ord2utf8.c \ - pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c \ - pcre_ucp_searchfuncs.c pcre_valid_utf8.c pcre_version.c \ - pcre_xclass.c ucp.h ucpinternal.h ucptable.h + pcre_globals.c pcre_info.c pcre_internal.h pcre_maketables.c \ + pcre_newline.c pcre_ord2utf8.c pcre_refcount.c pcre_study.c \ + pcre_tables.c pcre_try_flipped.c pcre_ucp_searchfuncs.c \ + pcre_valid_utf8.c pcre_version.c pcre_xclass.c ucp.h \ + ucpinternal.h ucptable.h libpcre_a_CPPFLAGS = libpcre_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS) ============================================================ --- sqlite/Makefile.am 80e44e7d51192dc444870447119e8a51f170f0ae +++ sqlite/Makefile.am ef1193d1b936b1f03cbc90f5cc32378ffd79b735 @@ -1,18 +1,17 @@ -AUTOMAKE_OPTIONS=subdir-objects 1.7.1 -ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS=subdir-objects no-dist 1.7.1 -noinst_LIBRARIES = libsqlite.a +lib_LIBRARIES = libsqlite.a +include_HEADERS = sqlite3.h sqlite3ext.h libsqlite_a_SOURCES = \ alter.c analyze.c attach.c auth.c btree.c btree.h btreeInt.h \ build.c callback.c complete.c date.c delete.c expr.c func.c \ hash.c hash.h insert.c keywordhash.h legacy.c loadext.c main.c \ malloc.c opcodes.c opcodes.h os.c os_common.h os.h os_os2.c \ os_os2.h os_unix.c os_win.c pager.c pager.h parse.c parse.h \ - pragma.c prepare.c printf.c random.c select.c sqlite3ext.h \ - sqlite3.h sqliteInt.h sqliteLimit.h table.c tokenize.c \ - trigger.c update.c utf.c util.c vacuum.c vdbeapi.c vdbeaux.c \ - vdbeblob.c vdbe.c vdbefifo.c vdbe.h vdbeInt.h vdbemem.c vtab.c \ - where.c + pragma.c prepare.c printf.c random.c select.c sqliteInt.h \ + sqliteLimit.h table.c tokenize.c trigger.c update.c utf.c \ + util.c vacuum.c vdbeapi.c vdbeaux.c vdbeblob.c vdbe.c \ + vdbefifo.c vdbe.h vdbeInt.h vdbemem.c vtab.c where.c libsqlite_a_CPPFLAGS = libsqlite_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS)