fix gmake on linux

This commit is contained in:
Marian Krivos 2012-04-23 10:24:48 +00:00
parent d75e68c027
commit a0daaba97e
23 changed files with 62 additions and 61 deletions

View File

@ -15,6 +15,6 @@ objects = MySQLTestSuite Driver MySQLTest SQLExecutor
target = testrunner
target_version = 1
target_libs = PocoMySQL PocoData PocoFoundation CppUnit
target_libs = PocoDataMySQL PocoData PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec

View File

@ -27,10 +27,10 @@ COMMONFLAGS += -DPOCO_UNIXODBC
else
ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
SYSLIBS += -liodbc -liodbcinst
COMMONFLAGS += -DPOCO_IODBC
COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
else
ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
SYSLIBS += -liodbc -liodbcinst
SYSLIBS += -liodbc -liodbcinst -I/usr/include/iodbc
COMMONFLAGS += -DPOCO_IODBC
else
$(error No ODBC library found. Please install unixODBC or iODBC and try again)

View File

@ -23,7 +23,7 @@ COMMONFLAGS += -DPOCO_UNIXODBC
else
ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
SYSLIBS += -liodbc -liodbcinst
COMMONFLAGS += -DPOCO_IODBC
COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
else
$(error No ODBC library found. Please install unixODBC or iODBC and try again)
endif
@ -39,6 +39,6 @@ endif
target = testrunner
target_version = 1
target_libs = PocoODBC PocoData PocoFoundation CppUnit
target_libs = PocoDataODBC PocoData PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec

View File

@ -12,6 +12,6 @@ objects = Binding
target = Binding
target_version = 1
target_libs = PocoSQLite PocoData PocoFoundation
target_libs = PocoDataSQLite PocoData PocoFoundation
include $(POCO_BASE)/build/rules/exec

View File

@ -12,6 +12,6 @@ objects = RecordSet
target = RecordSet
target_version = 1
target_libs = PocoSQLite PocoData PocoFoundation
target_libs = PocoDataSQLite PocoData PocoFoundation
include $(POCO_BASE)/build/rules/exec

View File

@ -12,6 +12,6 @@ objects = RowFormatter
target = RowFormatter
target_version = 1
target_libs = PocoSQLite PocoData PocoFoundation
target_libs = PocoDataSQLite PocoData PocoFoundation
include $(POCO_BASE)/build/rules/exec

View File

@ -12,6 +12,6 @@ objects = Tuple
target = Tuple
target_version = 1
target_libs = PocoSQLite PocoData PocoFoundation
target_libs = PocoDataSQLite PocoData PocoFoundation
include $(POCO_BASE)/build/rules/exec

View File

@ -12,6 +12,6 @@ objects = TypeHandler
target = TypeHandler
target_version = 1
target_libs = PocoSQLite PocoData PocoFoundation
target_libs = PocoDataSQLite PocoData PocoFoundation
include $(POCO_BASE)/build/rules/exec

View File

@ -29,9 +29,10 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel Base64Decoder Base64E
TemporaryFile TextConverter TextEncoding TextIterator TextBufferIterator Thread ThreadLocal \
ThreadPool ThreadTarget ActiveDispatcher Timer Timespan Timestamp Timezone Token URI \
FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \
UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \
Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \
MemoryStream FileStream Unicode UTF8String AtomicCounter
UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Var VarHolder Format \
Pipe PipeImpl PipeStream SharedMemory \
MemoryStream FileStream Unicode UTF8String AtomicCounter \
Windows1250Encoding Windows1251Encoding Latin2Encoding
zlib_objects = adler32 compress crc32 deflate \
infback inffast inflate inftrees trees zutil

View File

@ -1,48 +1,48 @@
#
# Makefile
#
#
# Makefile
#
# $Id: //poco/1.4/Foundation/testsuite/Makefile-Driver#2 $
#
# Makefile for Poco Foundation testsuite
#
include $(POCO_BASE)/build/rules/global
objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
AutoPtrTest SharedPtrTest AutoReleasePoolTest Base64Test \
BinaryReaderWriterTest LineEndingConverterTest \
ByteOrderTest ChannelTest ClassLoaderTest CoreTest CoreTestSuite \
CountingStreamTest CryptTestSuite DateTimeFormatterTest \
DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest \
Driver DynamicFactoryTest FPETest FileChannelTest FileTest GlobTest FilesystemTestSuite \
FoundationTestSuite HMACEngineTest HexBinaryTest LoggerTest \
LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
NamedEventTest NamedMutexTest ProcessesTestSuite ProcessTest \
MemoryPoolTest MD4EngineTest MD5EngineTest ManifestTest \
NDCTest NotificationCenterTest NotificationQueueTest \
PriorityNotificationQueueTest TimedNotificationQueueTest \
NotificationsTestSuite NullStreamTest NumberFormatterTest \
NumberParserTest PathTest PatternFormatterTest RWLockTest \
RandomStreamTest RandomTest RegularExpressionTest SHA1EngineTest \
SemaphoreTest ConditionTest SharedLibraryTest SharedLibraryTestSuite \
SimpleFileChannelTest StopwatchTest \
StreamConverterTest StreamCopierTest StreamTokenizerTest \
StreamsTestSuite StringTest StringTokenizerTest TaskTestSuite TaskTest \
TaskManagerTest TestChannel TeeStreamTest UTF8StringTest \
TextConverterTest TextIteratorTest TextBufferIteratorTest TextTestSuite TextEncodingTest \
ThreadLocalTest ThreadPoolTest ThreadTest ThreadingTestSuite TimerTest \
TimespanTest TimestampTest TimezoneTest URIStreamOpenerTest URITest \
URITestSuite UUIDGeneratorTest UUIDTest UUIDTestSuite ZLibTest \
TestPlugin DummyDelegate BasicEventTest FIFOEventTest PriorityEventTest EventTestSuite \
LRUCacheTest ExpireCacheTest ExpireLRUCacheTest CacheTestSuite AnyTest FormatTest \
HashingTestSuite HashTableTest SimpleHashTableTest LinearHashTableTest \
HashSetTest HashMapTest SharedMemoryTest \
UniqueExpireCacheTest UniqueExpireLRUCacheTest \
TuplesTest NamedTuplesTest TypeListTest DynamicAnyTest FileStreamTest \
MemoryStreamTest
target = testrunner
target_version = 1
target_libs = PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec
#
# Makefile for Poco Foundation testsuite
#
include $(POCO_BASE)/build/rules/global
objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
AutoPtrTest ArrayTest SharedPtrTest AutoReleasePoolTest Base64Test \
BinaryReaderWriterTest LineEndingConverterTest \
ByteOrderTest ChannelTest ClassLoaderTest CoreTest CoreTestSuite \
CountingStreamTest CryptTestSuite DateTimeFormatterTest \
DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest \
Driver DynamicFactoryTest FPETest FileChannelTest FileTest GlobTest FilesystemTestSuite \
FoundationTestSuite HMACEngineTest HexBinaryTest LoggerTest \
LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
NamedEventTest NamedMutexTest ProcessesTestSuite ProcessTest \
MemoryPoolTest MD4EngineTest MD5EngineTest ManifestTest \
NDCTest NotificationCenterTest NotificationQueueTest \
PriorityNotificationQueueTest TimedNotificationQueueTest \
NotificationsTestSuite NullStreamTest NumberFormatterTest \
NumberParserTest PathTest PatternFormatterTest RWLockTest \
RandomStreamTest RandomTest RegularExpressionTest SHA1EngineTest \
SemaphoreTest ConditionTest SharedLibraryTest SharedLibraryTestSuite \
SimpleFileChannelTest StopwatchTest \
StreamConverterTest StreamCopierTest StreamTokenizerTest \
StreamsTestSuite StringTest StringTokenizerTest TaskTestSuite TaskTest \
TaskManagerTest TestChannel TeeStreamTest UTF8StringTest \
TextConverterTest TextIteratorTest TextBufferIteratorTest TextTestSuite TextEncodingTest \
ThreadLocalTest ThreadPoolTest ThreadTest ThreadingTestSuite TimerTest \
TimespanTest TimestampTest TimezoneTest URIStreamOpenerTest URITest \
URITestSuite UUIDGeneratorTest UUIDTest UUIDTestSuite ZLibTest \
TestPlugin DummyDelegate BasicEventTest FIFOEventTest PriorityEventTest EventTestSuite \
LRUCacheTest ExpireCacheTest ExpireLRUCacheTest CacheTestSuite AnyTest FormatTest \
HashingTestSuite HashTableTest SimpleHashTableTest LinearHashTableTest \
HashSetTest HashMapTest SharedMemoryTest \
UniqueExpireCacheTest UniqueExpireLRUCacheTest \
TuplesTest NamedTuplesTest TypeListTest VarTest DynamicTestSuite FileStreamTest \
MemoryStreamTest
target = testrunner
target_version = 1
target_libs = PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec

0
build/script/makedepend.SunCC Normal file → Executable file
View File

0
build/script/makedepend.aCC Normal file → Executable file
View File

0
build/script/makedepend.clang Normal file → Executable file
View File

0
build/script/makedepend.cxx Normal file → Executable file
View File

0
build/script/makedepend.gcc Normal file → Executable file
View File

0
build/script/makedepend.qcc Normal file → Executable file
View File

0
build/script/makedepend.xlC Normal file → Executable file
View File

0
build/script/makeldpath Normal file → Executable file
View File

0
build/script/projname Normal file → Executable file
View File

0
build/script/shlibln Normal file → Executable file
View File

0
build/script/vxprogen Normal file → Executable file
View File

View File

@ -8,7 +8,7 @@ NetSSL_OpenSSL
Data
Data/SQLite
Data/ODBC
#Data/MySQL
Data/MySQL
Zip
PageCompiler
PageCompiler/File2Page

0
configure vendored Normal file → Executable file
View File