[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: fa073c
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: fa073c55cebc1a128fba8930c71a89857b7a98cf |
Date: |
Thu, 30 Dec 2010 01:35:30 GMT |
revision: fa073c55cebc1a128fba8930c71a89857b7a98cf
date: 2010-12-30T01:35:07
author: address@hidden
branch: net.venge.monotone.source-tree-cleanup
changelog:
Create libplatform.a and lib3rdparty.a in builddir/src as well;
there is no need that libplatform.a contains tester-platf.h as
source, not a single code line from the defined functions there
goes into that library.
manifest:
format_version "1"
new_manifest [817eed98b936a29474a8d3773e685769cf5652aa]
old_revision [cb4e6c18118fa2421e17eb684d16c82da4c911ff]
patch "Makefile.am"
from [c725bba98ed339861f130e5fab0f9a080b0336d5]
to [a82e2b163643b509496a79129231ceb3e0a1193a]
============================================================
--- Makefile.am c725bba98ed339861f130e5fab0f9a080b0336d5
+++ Makefile.am a82e2b163643b509496a79129231ceb3e0a1193a
@@ -234,10 +234,10 @@ txt2c_SOURCES = util/txt2c.cc
txt2c_SOURCES = util/txt2c.cc
-noinst_LIBRARIES = libplatform.a lib3rdparty.a
-libplatform_a_SOURCES = src/platform.hh test/src/tester-plaf.hh
-lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \
- $(NETXX_SOURCES)
+noinst_LIBRARIES = src/libplatform.a src/lib3rdparty.a
+src_libplatform_a_SOURCES = src/platform.hh
+src_lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \
+ $(NETXX_SOURCES)
htmldir = $(datadir)/doc/monotone
html_DATA = monotone.html texinfo.css
@@ -287,37 +287,38 @@ AM_CPPFLAGS = $(intl_CFLAGS) $(pcre_CFLA
AM_CPPFLAGS = $(intl_CFLAGS) $(pcre_CFLAGS) $(botan_CFLAGS) \
$(lua_CFLAGS) $(sqlite3_CFLAGS) $(idn_CFLAGS)
-LDADD = libplatform.a lib3rdparty.a $(intl_LIBS) $(pcre_LIBS) \
+LDADD = src/libplatform.a src/lib3rdparty.a $(intl_LIBS) $(pcre_LIBS) \
$(botan_LIBS) $(lua_LIBS) $(sqlite3_LIBS) $(idn_LIBS)
if WIN32_PLATFORM
- libplatform_a_SOURCES += $(WIN32_PLATFORM_SOURCES)
+ src_libplatform_a_SOURCES += $(WIN32_PLATFORM_SOURCES)
mtn_SOURCES += src/win32/main.cc
test_bin_tester_SOURCES += test/src/win32/tester-plaf.cc
test_bin_check_net_SOURCES = test/src/win32/tester-check-net.cc
AM_CPPFLAGS += -DWIN32
LDADD += -lshfolder -lws2_32 -liconv -liphlpapi
else
- libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES)
+ src_libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES)
mtn_SOURCES += src/unix/main.cc
test_bin_tester_SOURCES += test/src/unix/tester-plaf.cc
test_bin_check_net_SOURCES = test/src/unix/tester-check-net.cc
endif
if MISSING_INET_PTON
- lib3rdparty_a_SOURCES += src/netxx/inet_pton.cxx src/netxx/inet_pton.h
+ src_lib3rdparty_a_SOURCES += src/netxx/inet_pton.cxx src/netxx/inet_pton.h
AM_CPPFLAGS += -DNETXX_NO_PTON
endif
if MISSING_INET_NTOP
- lib3rdparty_a_SOURCES += src/netxx/inet_ntop.cxx src/netxx/inet_ntop.h
+ src_lib3rdparty_a_SOURCES += src/netxx/inet_ntop.cxx src/netxx/inet_ntop.h
AM_CPPFLAGS += -DNETXX_NO_NTOP
endif
if MISSING_GETADDRINFO
- lib3rdparty_a_SOURCES += src/netxx/resolve_gethostbyname.cxx src/netxx/resolve_getservbyname.cxx
+ src_lib3rdparty_a_SOURCES += src/netxx/resolve_gethostbyname.cxx \
+ src/netxx/resolve_getservbyname.cxx
else
- lib3rdparty_a_SOURCES += src/netxx/resolve_getaddrinfo.cxx
+ src_lib3rdparty_a_SOURCES += src/netxx/resolve_getaddrinfo.cxx
endif
if MISSING_INET6
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: fa073c55cebc1a128fba8930c71a89857b7a98cf,
code <=