Skip to content

Commit a360bf9

Browse files
author
Marian Krivos
committed
trunk/branch integration: fix makefile README CHANGELOG components configure etc.
1 parent 86c5746 commit a360bf9

8 files changed

Lines changed: 1383 additions & 163 deletions

File tree

‎CHANGELOG‎

Lines changed: 839 additions & 0 deletions
Large diffs are not rendered by default.

‎CONTRIBUTORS‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
Guenter Obiltschnig <guenter.obiltschnig@appinf.com>
22
Alex Fabijanic <aleskx@gmail.com>
33
Peter Schojer <peter.schojer@appinf.com>
4+
Ferdinand Beyer <fbeyer@users.sourceforge.net>
5+
Krzysztof Burghardt <burghardt@users.sourceforge.net>
46
Claus Dabringer <claus.dabringer@appinf.com>
5-
Andrew Marlow <public@marlowa.plus.com>
67
Caleb Epstein <caleb.epstein@gmail.com>
8+
Eran Hammer-Lahav <therazorblade@users.sourceforge.net>
9+
Chris Johnson <devcjohnson@gmail.com>
10+
Sergey Kholodilov <serghol@gmail.com>
11+
Ryan Kraay <rkraay@users.sourceforge.net>
12+
Larry Lewis <lewislp@users.sourceforge.net>
713
Andrew J. P. Maclean <a.maclean@optusnet.com.au>
14+
Andrew Marlow <public@marlowa.plus.com>
815
Paschal Mushubi <mushubi@sympatico.ca>
9-
Sergey N. Yatskevich <snc@spectrum-soft.ru>
10-
Krzysztof Burghardt <burghardt@users.sourceforge.net>
16+
Jiang Shan <pasorobo@users.sourceforge.net>
1117
David Shawley <boredc0der@users.sourceforge.net>
12-
Larry Lewis <lewislp@users.sourceforge.net>
13-
Ryan Kraay <rkraay@users.sourceforge.net>
14-
Eran Hammer-Lahav <therazorblade@users.sourceforge.net>
15-
Tom Tan
16-
Chris Johnson <devcjohnson@gmail.com>
18+
Sergey Skorokhodov <ryppka@users.sourceforge.net>
19+
Tom Tan <>
20+
Sergey N. Yatskevich <snc@begun.ru>
21+
Marc Chevrier
22+
Philippe Cuvillier
1723

1824
--
19-
$Id: //poco/Main/dist/CONTRIBUTORS#7 $
25+
$Id: //poco/1.4/dist/CONTRIBUTORS#1 $

‎Makefile‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ endif
2424
all: libexecs tests samples
2525

2626
INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
27-
COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC
27+
COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip PageCompiler PageCompiler/File2Page
2828

2929
cppunit:
3030
$(MAKE) -C $(POCO_BASE)/CppUnit
@@ -44,9 +44,9 @@ install: libexecs
4444
find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
4545
find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
4646

47-
libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec
48-
tests = Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests
49-
samples = Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples
47+
libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec
48+
tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests
49+
samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples
5050

5151
.PHONY: $(libexecs)
5252
.PHONY: $(tests)
@@ -92,7 +92,16 @@ Net-tests: Net-libexec cppunit
9292
Net-samples: Net-libexec Foundation-libexec XML-libexec Util-libexec
9393
$(MAKE) -C $(POCO_BASE)/Net/samples
9494

95-
NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec
95+
Crypto-libexec: Foundation-libexec
96+
$(MAKE) -C $(POCO_BASE)/Crypto
97+
98+
Crypto-tests: Crypto-libexec cppunit
99+
$(MAKE) -C $(POCO_BASE)/Crypto/testsuite
100+
101+
Crypto-samples: Crypto-libexec Foundation-libexec Util-libexec
102+
$(MAKE) -C $(POCO_BASE)/Crypto/samples
103+
104+
NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec Crypto-libexec
96105
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL
97106

98107
NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit
@@ -122,6 +131,30 @@ Data/ODBC-libexec: Foundation-libexec Data-libexec
122131
Data/ODBC-tests: Data/ODBC-libexec cppunit
123132
$(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite
124133

134+
Data/MySQL-libexec: Foundation-libexec Data-libexec
135+
$(MAKE) -C $(POCO_BASE)/Data/MySQL
136+
137+
Data/MySQL-tests: Data/MySQL-libexec cppunit
138+
$(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite
139+
140+
Zip-libexec: Foundation-libexec Net-libexec Util-libexec XML-libexec
141+
$(MAKE) -C $(POCO_BASE)/Zip
142+
143+
Zip-tests: Zip-libexec cppunit
144+
$(MAKE) -C $(POCO_BASE)/Zip/testsuite
145+
146+
Zip-samples: Zip-libexec
147+
$(MAKE) -C $(POCO_BASE)/Zip/samples
148+
149+
PageCompiler-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec
150+
$(MAKE) -C $(POCO_BASE)/PageCompiler
151+
152+
PageCompiler-samples: PageCompiler-libexec
153+
$(MAKE) -C $(POCO_BASE)/PageCompiler/samples
154+
155+
PageCompiler/File2Page-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec
156+
$(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page
157+
125158
clean:
126159
$(MAKE) -C $(POCO_BASE)/Foundation clean
127160
$(MAKE) -C $(POCO_BASE)/Foundation/testsuite clean
@@ -135,6 +168,9 @@ clean:
135168
$(MAKE) -C $(POCO_BASE)/Net clean
136169
$(MAKE) -C $(POCO_BASE)/Net/testsuite clean
137170
$(MAKE) -C $(POCO_BASE)/Net/samples clean
171+
$(MAKE) -C $(POCO_BASE)/Crypto clean
172+
$(MAKE) -C $(POCO_BASE)/Crypto/testsuite clean
173+
$(MAKE) -C $(POCO_BASE)/Crypto/samples clean
138174
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL clean
139175
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite clean
140176
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples clean
@@ -145,6 +181,15 @@ clean:
145181
$(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite clean
146182
$(MAKE) -C $(POCO_BASE)/Data/ODBC clean
147183
$(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite clean
184+
$(MAKE) -C $(POCO_BASE)/Data/MySQL clean
185+
$(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite clean
186+
$(MAKE) -C $(POCO_BASE)/Zip clean
187+
$(MAKE) -C $(POCO_BASE)/Zip/testsuite clean
188+
$(MAKE) -C $(POCO_BASE)/Zip/samples clean
189+
$(MAKE) -C $(POCO_BASE)/PageCompiler clean
190+
$(MAKE) -C $(POCO_BASE)/PageCompiler/samples clean
191+
$(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page clean
192+
$(MAKE) -C $(POCO_BASE)/CppUnit clean
148193

149194
distclean:
150195
rm -rf $(POCO_BUILD)/lib

0 commit comments

Comments
 (0)