From 473f818a213093ec54eb8fa47663a6b275e8e29c Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 25 Aug 2006 00:15:31 +0100 Subject: [PATCH] Temporarily comment out some stuff until the new event system is resolved. --- src/liblw-support/build.lib | 2 +- src/liblw-support/build.monolithic | 13 +++++++------ ..._EchoServerTCP.cpp => Net_EchoServerTCP.cpp.xxx} | 0 .../{Net_SMTPClient.cpp => Net_SMTPClient.cpp.xxx} | 0 4 files changed, 8 insertions(+), 7 deletions(-) rename src/tests/{Net_EchoServerTCP.cpp => Net_EchoServerTCP.cpp.xxx} (100%) rename src/tests/{Net_SMTPClient.cpp => Net_SMTPClient.cpp.xxx} (100%) diff --git a/src/liblw-support/build.lib b/src/liblw-support/build.lib index f4badfc..37d9f90 100644 --- a/src/liblw-support/build.lib +++ b/src/liblw-support/build.lib @@ -10,7 +10,7 @@ then source src/liblw-support/soversion liblw_support="obj/${liblw_support_BASE}.so.${SOMAJOR}.${SOMINOR}.${SOMICRO}" - SO_EXTRA="$(pkg-config libutf8++ --libs --cflags) -lstdc++ -lc" + SO_EXTRA="$(pkg-config libutf8++ --libs --cflags) -lstdc++ -lpthread -lrt -lc" echo "Building library ${liblw_support}..." diff --git a/src/liblw-support/build.monolithic b/src/liblw-support/build.monolithic index d74b57e..2a33583 100644 --- a/src/liblw-support/build.monolithic +++ b/src/liblw-support/build.monolithic @@ -11,7 +11,6 @@ then MONOLITHIC_SOURCE="$(echo src/liblw-support/TopHeader.h) $(echo src/liblw-support/Enums/{IOMode,IOTimeoutMode,ISO8601Format}.h) $(echo src/liblw-support/ForwardDeclare.h) - $(echo src/liblw-support//{}.h) $(echo src/liblw-support/Util/{Uncopyable,Key}.h) $(echo src/liblw-support/Exceptions/{Exception,SystemError,Bad{Argument,String,Time},ParseError,IO,FIFO,HTTP,DNS,NullPointer}.h) $(echo src/liblw-support/Util/{FIFO,Completion}.h) @@ -20,9 +19,10 @@ then $(echo src/liblw-support/Thread/{Mutex,MutexPadlock,Semaphore,CompletionNotifier,Thread}.h) $(echo src/liblw-support/IO/{Interface,Filter,Device,PosixDevice,SerialPort,Pipe}.h) $(echo src/liblw-support/Events/{Callback{IO,Timer,Update},EventManager}.h) - $(echo src/liblw-support/Net/{Server,ServerCallback,Client,Address/{Address,IPv4,IPv6},TCP/{Client,Server},Protocols/{HTTP,SMTP}}.h) - $(echo src/liblw-support/IO/Util/WriteTask.h) - $(echo src/liblw-support/lib/Util/Log.h) + $(echo src/liblw-support/Net/{Server,ServerCallback,Client,Address/{Address,IPv4,IPv6},TCP/{Client,Server},Protocols/HTTP}.h) + $(true echo src/liblw-support/Net/Protocols/SMTP.h) + $(true echo src/liblw-support/IO/Util/WriteTask.h) + $(echo src/liblw-support/Util/Log.h) $(echo src/liblw-support/BottomHeader.h)" make_monolithic ${HDR} C || return 1 @@ -33,8 +33,9 @@ then $(echo src/liblw-support/Time/{ElapsedTime,StopWatch,DayTime,DateTables,Date,DateTime}.cpp) $(echo src/liblw-support/Thread/{Mutex,Semaphore,CompletionNotifier,Thread}.cpp) $(echo src/liblw-support/Util/{FIFO,Log,Completion,Key}.cpp) - $(echo src/liblw-support/Net/{Server,ServerCallback,Client,Address/{Address,IPv4,IPv6},TCP/{Server,Client},Protocols/{HTTP,SMTP}}.cpp) - $(echo src/liblw-support/IO/Util/WriteTask.cpp) + $(echo src/liblw-support/Net/{Server,ServerCallback,Client,Address/{Address,IPv4,IPv6},TCP/{Server,Client},Protocols/HTTP}.cpp) + $(true echo src/liblw-support/Net/Protocols/SMTP.cpp) + $(true echo src/liblw-support/IO/Util/WriteTask.cpp) $(echo src/liblw-support/Events/{EventManager,CallbackUpdate}.cpp) " make_monolithic ${SRC} C || return 1 diff --git a/src/tests/Net_EchoServerTCP.cpp b/src/tests/Net_EchoServerTCP.cpp.xxx similarity index 100% rename from src/tests/Net_EchoServerTCP.cpp rename to src/tests/Net_EchoServerTCP.cpp.xxx diff --git a/src/tests/Net_SMTPClient.cpp b/src/tests/Net_SMTPClient.cpp.xxx similarity index 100% rename from src/tests/Net_SMTPClient.cpp rename to src/tests/Net_SMTPClient.cpp.xxx