# # # add_file "idna/Makefile.am" # content [c9c2823b490ad3bd3b403da2cf19e83de6e06154] # # add_file "pcre/Makefile.am" # content [8a97bcc2bfc3278c789c95e16c6794b689f58282] # # add_file "sqlite/Makefile.am" # content [80e44e7d51192dc444870447119e8a51f170f0ae] # # patch "Makefile.am" # from [9dc6dc47bb6ffd8bb30fdea3cfb93af57fb8bc11] # to [16b8929f06616df94a8f75e303fca2b51bbe29a6] # # patch "configure.ac" # from [412a36fa2ba992a81bc17f9ba0a64fe3fdc6ff46] # to [a9dcf4eee9172e8ef6e0316bb4727bce462bf3cf] # # patch "monotone/Makefile.am" # from [6734ef8f2516168902519ec3c770f96bf06745d2] # to [44107aab2fa94ccae0b6595728d515f3d9277682] # ============================================================ --- idna/Makefile.am c9c2823b490ad3bd3b403da2cf19e83de6e06154 +++ idna/Makefile.am c9c2823b490ad3bd3b403da2cf19e83de6e06154 @@ -0,0 +1,13 @@ +AUTOMAKE_OPTIONS=subdir-objects 1.7.1 +ACLOCAL_AMFLAGS = -I m4 + +noinst_LIBRARIES = libidna.a +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 + +libidna_a_CPPFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS) +libidna_a_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/.. $(LIB3RDPARTY_CFLAGS) +libidna_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)/.. $(LIB3RDPARTY_CXXFLAGS) + ============================================================ --- pcre/Makefile.am 8a97bcc2bfc3278c789c95e16c6794b689f58282 +++ pcre/Makefile.am 8a97bcc2bfc3278c789c95e16c6794b689f58282 @@ -0,0 +1,17 @@ +AUTOMAKE_OPTIONS=subdir-objects 1.7.1 +ACLOCAL_AMFLAGS = -I m4 + +noinst_LIBRARIES = libpcre.a +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 + +libpcre_a_CPPFLAGS = +libpcre_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS) +libpcre_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS) + ============================================================ --- sqlite/Makefile.am 80e44e7d51192dc444870447119e8a51f170f0ae +++ sqlite/Makefile.am 80e44e7d51192dc444870447119e8a51f170f0ae @@ -0,0 +1,20 @@ +AUTOMAKE_OPTIONS=subdir-objects 1.7.1 +ACLOCAL_AMFLAGS = -I m4 + +noinst_LIBRARIES = libsqlite.a +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 + +libsqlite_a_CPPFLAGS = +libsqlite_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS) +libsqlite_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS) + ============================================================ --- Makefile.am 9dc6dc47bb6ffd8bb30fdea3cfb93af57fb8bc11 +++ Makefile.am 16b8929f06616df94a8f75e303fca2b51bbe29a6 @@ -1,2 +1,2 @@ ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = po netxx lua idna botan pcre sqlite monotone -SUBDIRS = po netxx lua botan monotone ============================================================ --- configure.ac 412a36fa2ba992a81bc17f9ba0a64fe3fdc6ff46 +++ configure.ac a9dcf4eee9172e8ef6e0316bb4727bce462bf3cf @@ -6,7 +6,8 @@ AM_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.9 tar-ustar std-options]) AC_CONFIG_SRCDIR([monotone/app_state.cc]) AM_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile netxx/Makefile lua/Makefile monotone/Makefile]) +AC_CONFIG_FILES([Makefile netxx/Makefile lua/Makefile idna/Makefile + pcre/Makefile sqlite/Makefile monotone/Makefile]) # Checks for programs. dnl Note: AC_PROG_CC is implied by AM_PROG_CC_C_O and in any case has ============================================================ --- monotone/Makefile.am 6734ef8f2516168902519ec3c770f96bf06745d2 +++ monotone/Makefile.am 44107aab2fa94ccae0b6595728d515f3d9277682 @@ -94,49 +94,6 @@ BOOST_SANDBOX_SOURCES = \ boost/circular_buffer_fwd.hpp \ boost/circular_buffer.hpp -SQLITE_SOURCES = \ - sqlite/alter.c sqlite/attach.c sqlite/auth.c sqlite/btree.c \ - sqlite/build.c sqlite/date.c sqlite/delete.c sqlite/expr.c \ - sqlite/func.c sqlite/hash.c sqlite/insert.c \ - sqlite/legacy.c sqlite/main.c sqlite/opcodes.c \ - sqlite/os.c sqlite/os_unix.c sqlite/os_win.c sqlite/os_os2.c \ - sqlite/pager.c sqlite/parse.c sqlite/pragma.c sqlite/printf.c \ - sqlite/random.c sqlite/select.c \ - sqlite/table.c sqlite/tokenize.c \ - sqlite/trigger.c sqlite/update.c sqlite/utf.c \ - sqlite/util.c sqlite/vacuum.c \ - sqlite/vdbe.c sqlite/vdbeapi.c sqlite/vdbeaux.c \ - sqlite/vdbemem.c sqlite/where.c \ - sqlite/prepare.c sqlite/callback.c \ - sqlite/analyze.c sqlite/vdbefifo.c \ - sqlite/complete.c sqlite/malloc.c sqlite/vdbeblob.c \ - sqlite/loadext.c sqlite/vtab.c \ - \ - sqlite/btree.h sqlite/hash.h sqlite/opcodes.h sqlite/os.h \ - sqlite/os_common.h sqlite/os_os2.h \ - sqlite/parse.h sqlite/sqlite3.h sqlite/sqlite3ext.h \ - sqlite/sqliteInt.h \ - sqlite/vdbe.h sqlite/vdbeInt.h \ - sqlite/pager.h sqlite/btreeInt.h sqlite/sqliteLimit.h - -IDNA_SOURCES = \ - idna/gunibreak.h idna/gunidecomp.h idna/idna.h idna/nfkc.c \ - idna/punycode.c idna/rfc3454.c idna/stringprep.h idna/version.c \ - idna/gunicomp.h idna/idna.c idna/idn-int.h idna/profiles.c \ - idna/punycode.h idna/stringprep.c idna/toutf8.c - -PCRE_SOURCES = \ - pcre/pcre_chartables.c pcre/pcre_compile.c pcre/pcre_config.c \ - pcre/pcre_dfa_exec.c pcre/pcre_exec.c pcre/pcre_fullinfo.c \ - pcre/pcre_get.c pcre/pcre_globals.c pcre/pcre_info.c \ - pcre/pcre_maketables.c pcre/pcre_newline.c \ - pcre/pcre_ord2utf8.c pcre/pcre_refcount.c pcre/pcre_study.c \ - pcre/pcre_tables.c pcre/pcre_try_flipped.c \ - pcre/pcre_ucp_searchfuncs.c pcre/pcre_valid_utf8.c \ - pcre/pcre_version.c pcre/pcre_xclass.c pcre/pcre_config.h \ - pcre/pcre.h pcre/pcre_internal.h pcre/ucp.h pcre/ucpinternal.h \ - pcre/ucptable.h - UNIX_PLATFORM_SOURCES = \ unix/read_password.cc unix/get_system_flavour.cc \ unix/process.cc unix/terminal.cc unix/inodeprint.cc \ @@ -207,16 +164,9 @@ txt2c_SOURCES = txt2c.cc txt2c_SOURCES = txt2c.cc -noinst_LIBRARIES = libplatform.a lib3rdparty.a +noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = platform.hh tester-plaf.hh -lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \ - $(IDNA_SOURCES) \ - $(SQLITE_SOURCES) -if INCLUDED_PCRE -lib3rdparty_a_SOURCES += $(PCRE_SOURCES) -endif - htmldir = $(datadir)/doc/monotone html_DATA = monotone.html @@ -254,48 +204,28 @@ AM_LDFLAGS = AM_CXXFLAGS = $(AM_CPPFLAGS) AM_LDFLAGS = -lib3rdparty_a_CPPFLAGS = -lib3rdparty_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS) -lib3rdparty_a_CXXFLAGS = $(AM_CXXFLAGS) $(LIB3RDPARTY_CXXFLAGS) - mtn_LDFLAGS = mtn_CPPFLAGS = -I$(top_srcdir)/lua mtn_CFLAGS = $(AM_CFLAGS) $(MTN_CFLAGS) mtn_CXXFLAGS = $(AM_CXXFLAGS) $(PCH_FLAGS) $(MTN_CXXFLAGS) -mtn_LDADD = libplatform.a lib3rdparty.a $(BOOSTLIBS) $(LIBICONV) $(LIBINTL) +mtn_LDADD = libplatform.a $(BOOSTLIBS) $(LIBICONV) $(LIBINTL) unit_tester_LDFLAGS = unit_tester_CPPFLAGS = -DBUILD_UNIT_TESTS -I$(top_srcdir)/lua unit_tester_CXXFLAGS = $(AM_CXXFLAGS) $(PCH_FLAGS) -unit_tester_LDADD += libplatform.a lib3rdparty.a \ +unit_tester_LDADD += libplatform.a \ $(BOOSTLIBS) $(LIBICONV) $(LIBINTL) tester_LDFLAGS = tester_CPPFLAGS = -I$(top_srcdir)/lua tester_CXXFLAGS = $(AM_CXXFLAGS) -tester_LDADD += libplatform.a lib3rdparty.a $(BOOSTLIBS) $(LIBICONV) $(LIBINTL) +tester_LDADD += libplatform.a $(BOOSTLIBS) $(LIBICONV) $(LIBINTL) -if INCLUDED_PCRE - lib3rdparty_a_CPPFLAGS += -I$(top_srcdir)/pcre - mtn_CPPFLAGS += -I$(top_srcdir)/pcre - unit_tester_CPPFLAGS += -I$(top_srcdir)/pcre - tester_CPPFLAGS += -I$(top_srcdir)/pcre -else - mtn_CPPFLAGS += $(PCRE_CFLAGS) - unit_tester_CPPFLAGS += $(PCRE_CFLAGS) - tester_CPPFLAGS += $(PCRE_CFLAGS) - - mtn_LDADD += $(PCRE_LIBS) - unit_tester_LDADD += $(PCRE_LIBS) - tester_LDADD += $(PCRE_LIBS) -endif - if WIN32_PLATFORM libplatform_a_SOURCES += $(WIN32_PLATFORM_SOURCES) mtn_SOURCES += win32/main.cc mtn_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi unit_tester_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi - lib3rdparty_a_CPPFLAGS += -DWIN32 tester_SOURCES += win32/tester-plaf.cc else libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES)