Skip to content

Commit a0daaba

Browse files
author
Marian Krivos
committed
fix gmake on linux
1 parent d75e68c commit a0daaba

File tree

23 files changed

+62
-61
lines changed

23 files changed

+62
-61
lines changed

‎Data/MySQL/testsuite/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ objects = MySQLTestSuite Driver MySQLTest SQLExecutor
1515

1616
target = testrunner
1717
target_version = 1
18-
target_libs = PocoMySQL PocoData PocoFoundation CppUnit
18+
target_libs = PocoDataMySQL PocoData PocoFoundation CppUnit
1919

2020
include $(POCO_BASE)/build/rules/exec

‎Data/ODBC/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ COMMONFLAGS += -DPOCO_UNIXODBC
2727
else
2828
ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
2929
SYSLIBS += -liodbc -liodbcinst
30-
COMMONFLAGS += -DPOCO_IODBC
30+
COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
3131
else
3232
ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
33-
SYSLIBS += -liodbc -liodbcinst
33+
SYSLIBS += -liodbc -liodbcinst -I/usr/include/iodbc
3434
COMMONFLAGS += -DPOCO_IODBC
3535
else
3636
$(error No ODBC library found. Please install unixODBC or iODBC and try again)

‎Data/ODBC/testsuite/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ COMMONFLAGS += -DPOCO_UNIXODBC
2323
else
2424
ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
2525
SYSLIBS += -liodbc -liodbcinst
26-
COMMONFLAGS += -DPOCO_IODBC
26+
COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
2727
else
2828
$(error No ODBC library found. Please install unixODBC or iODBC and try again)
2929
endif
@@ -39,6 +39,6 @@ endif
3939

4040
target = testrunner
4141
target_version = 1
42-
target_libs = PocoODBC PocoData PocoFoundation CppUnit
42+
target_libs = PocoDataODBC PocoData PocoFoundation CppUnit
4343

4444
include $(POCO_BASE)/build/rules/exec

‎Data/samples/Binding/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ objects = Binding
1212

1313
target = Binding
1414
target_version = 1
15-
target_libs = PocoSQLite PocoData PocoFoundation
15+
target_libs = PocoDataSQLite PocoData PocoFoundation
1616

1717
include $(POCO_BASE)/build/rules/exec

‎Data/samples/RecordSet/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ objects = RecordSet
1212

1313
target = RecordSet
1414
target_version = 1
15-
target_libs = PocoSQLite PocoData PocoFoundation
15+
target_libs = PocoDataSQLite PocoData PocoFoundation
1616

1717
include $(POCO_BASE)/build/rules/exec

‎Data/samples/RowFormatter/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ objects = RowFormatter
1212

1313
target = RowFormatter
1414
target_version = 1
15-
target_libs = PocoSQLite PocoData PocoFoundation
15+
target_libs = PocoDataSQLite PocoData PocoFoundation
1616

1717
include $(POCO_BASE)/build/rules/exec

‎Data/samples/Tuple/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ objects = Tuple
1212

1313
target = Tuple
1414
target_version = 1
15-
target_libs = PocoSQLite PocoData PocoFoundation
15+
target_libs = PocoDataSQLite PocoData PocoFoundation
1616

1717
include $(POCO_BASE)/build/rules/exec

‎Data/samples/TypeHandler/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ objects = TypeHandler
1212

1313
target = TypeHandler
1414
target_version = 1
15-
target_libs = PocoSQLite PocoData PocoFoundation
15+
target_libs = PocoDataSQLite PocoData PocoFoundation
1616

1717
include $(POCO_BASE)/build/rules/exec

‎Foundation/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel Base64Decoder Base64E
2929
TemporaryFile TextConverter TextEncoding TextIterator TextBufferIterator Thread ThreadLocal \
3030
ThreadPool ThreadTarget ActiveDispatcher Timer Timespan Timestamp Timezone Token URI \
3131
FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \
32-
UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \
33-
Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \
34-
MemoryStream FileStream Unicode UTF8String AtomicCounter
32+
UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Var VarHolder Format \
33+
Pipe PipeImpl PipeStream SharedMemory \
34+
MemoryStream FileStream Unicode UTF8String AtomicCounter \
35+
Windows1250Encoding Windows1251Encoding Latin2Encoding
3536

3637
zlib_objects = adler32 compress crc32 deflate \
3738
infback inffast inflate inftrees trees zutil

‎Foundation/testsuite/Makefile-Driver‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
#
2-
# Makefile
3-
#
1+
#
2+
# Makefile
3+
#
44
# $Id: //poco/1.4/Foundation/testsuite/Makefile-Driver#2 $
5-
#
6-
# Makefile for Poco Foundation testsuite
7-
#
8-
9-
include $(POCO_BASE)/build/rules/global
10-
11-
objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
12-
AutoPtrTest SharedPtrTest AutoReleasePoolTest Base64Test \
13-
BinaryReaderWriterTest LineEndingConverterTest \
14-
ByteOrderTest ChannelTest ClassLoaderTest CoreTest CoreTestSuite \
15-
CountingStreamTest CryptTestSuite DateTimeFormatterTest \
16-
DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest \
17-
Driver DynamicFactoryTest FPETest FileChannelTest FileTest GlobTest FilesystemTestSuite \
18-
FoundationTestSuite HMACEngineTest HexBinaryTest LoggerTest \
19-
LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
20-
NamedEventTest NamedMutexTest ProcessesTestSuite ProcessTest \
21-
MemoryPoolTest MD4EngineTest MD5EngineTest ManifestTest \
22-
NDCTest NotificationCenterTest NotificationQueueTest \
23-
PriorityNotificationQueueTest TimedNotificationQueueTest \
24-
NotificationsTestSuite NullStreamTest NumberFormatterTest \
25-
NumberParserTest PathTest PatternFormatterTest RWLockTest \
26-
RandomStreamTest RandomTest RegularExpressionTest SHA1EngineTest \
27-
SemaphoreTest ConditionTest SharedLibraryTest SharedLibraryTestSuite \
28-
SimpleFileChannelTest StopwatchTest \
29-
StreamConverterTest StreamCopierTest StreamTokenizerTest \
30-
StreamsTestSuite StringTest StringTokenizerTest TaskTestSuite TaskTest \
31-
TaskManagerTest TestChannel TeeStreamTest UTF8StringTest \
32-
TextConverterTest TextIteratorTest TextBufferIteratorTest TextTestSuite TextEncodingTest \
33-
ThreadLocalTest ThreadPoolTest ThreadTest ThreadingTestSuite TimerTest \
34-
TimespanTest TimestampTest TimezoneTest URIStreamOpenerTest URITest \
35-
URITestSuite UUIDGeneratorTest UUIDTest UUIDTestSuite ZLibTest \
36-
TestPlugin DummyDelegate BasicEventTest FIFOEventTest PriorityEventTest EventTestSuite \
37-
LRUCacheTest ExpireCacheTest ExpireLRUCacheTest CacheTestSuite AnyTest FormatTest \
38-
HashingTestSuite HashTableTest SimpleHashTableTest LinearHashTableTest \
39-
HashSetTest HashMapTest SharedMemoryTest \
40-
UniqueExpireCacheTest UniqueExpireLRUCacheTest \
41-
TuplesTest NamedTuplesTest TypeListTest DynamicAnyTest FileStreamTest \
42-
MemoryStreamTest
43-
44-
target = testrunner
45-
target_version = 1
46-
target_libs = PocoFoundation CppUnit
47-
48-
include $(POCO_BASE)/build/rules/exec
5+
#
6+
# Makefile for Poco Foundation testsuite
7+
#
8+
9+
include $(POCO_BASE)/build/rules/global
10+
11+
objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
12+
AutoPtrTest ArrayTest SharedPtrTest AutoReleasePoolTest Base64Test \
13+
BinaryReaderWriterTest LineEndingConverterTest \
14+
ByteOrderTest ChannelTest ClassLoaderTest CoreTest CoreTestSuite \
15+
CountingStreamTest CryptTestSuite DateTimeFormatterTest \
16+
DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest \
17+
Driver DynamicFactoryTest FPETest FileChannelTest FileTest GlobTest FilesystemTestSuite \
18+
FoundationTestSuite HMACEngineTest HexBinaryTest LoggerTest \
19+
LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
20+
NamedEventTest NamedMutexTest ProcessesTestSuite ProcessTest \
21+
MemoryPoolTest MD4EngineTest MD5EngineTest ManifestTest \
22+
NDCTest NotificationCenterTest NotificationQueueTest \
23+
PriorityNotificationQueueTest TimedNotificationQueueTest \
24+
NotificationsTestSuite NullStreamTest NumberFormatterTest \
25+
NumberParserTest PathTest PatternFormatterTest RWLockTest \
26+
RandomStreamTest RandomTest RegularExpressionTest SHA1EngineTest \
27+
SemaphoreTest ConditionTest SharedLibraryTest SharedLibraryTestSuite \
28+
SimpleFileChannelTest StopwatchTest \
29+
StreamConverterTest StreamCopierTest StreamTokenizerTest \
30+
StreamsTestSuite StringTest StringTokenizerTest TaskTestSuite TaskTest \
31+
TaskManagerTest TestChannel TeeStreamTest UTF8StringTest \
32+
TextConverterTest TextIteratorTest TextBufferIteratorTest TextTestSuite TextEncodingTest \
33+
ThreadLocalTest ThreadPoolTest ThreadTest ThreadingTestSuite TimerTest \
34+
TimespanTest TimestampTest TimezoneTest URIStreamOpenerTest URITest \
35+
URITestSuite UUIDGeneratorTest UUIDTest UUIDTestSuite ZLibTest \
36+
TestPlugin DummyDelegate BasicEventTest FIFOEventTest PriorityEventTest EventTestSuite \
37+
LRUCacheTest ExpireCacheTest ExpireLRUCacheTest CacheTestSuite AnyTest FormatTest \
38+
HashingTestSuite HashTableTest SimpleHashTableTest LinearHashTableTest \
39+
HashSetTest HashMapTest SharedMemoryTest \
40+
UniqueExpireCacheTest UniqueExpireLRUCacheTest \
41+
TuplesTest NamedTuplesTest TypeListTest VarTest DynamicTestSuite FileStreamTest \
42+
MemoryStreamTest
43+
44+
target = testrunner
45+
target_version = 1
46+
target_libs = PocoFoundation CppUnit
47+
48+
include $(POCO_BASE)/build/rules/exec

0 commit comments

Comments
 (0)