diff options
Diffstat (limited to 'debian/patches/002-Make-Examples-Buildable-standalone.diff')
| -rw-r--r-- | debian/patches/002-Make-Examples-Buildable-standalone.diff | 277 |
1 files changed, 248 insertions, 29 deletions
diff --git a/debian/patches/002-Make-Examples-Buildable-standalone.diff b/debian/patches/002-Make-Examples-Buildable-standalone.diff index a5d381e..7eea37d 100644 --- a/debian/patches/002-Make-Examples-Buildable-standalone.diff +++ b/debian/patches/002-Make-Examples-Buildable-standalone.diff @@ -1,28 +1,6 @@ Author: Adam Cécile (Le_Vert) <gandalf@le-vert.net> Description: This patch makes the examples build standalone. ---- a/src/examples/dicttest/dicttest.c -+++ b/src/examples/dicttest/dicttest.c -@@ -31,7 +31,7 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <mowgli.h> -+#include <libmowgli/mowgli.h> - - #ifdef _WIN32 - #define strcasecmp _stricmp ---- a/src/examples/dicttest/Makefile -+++ b/src/examples/dicttest/Makefile -@@ -1,7 +1,7 @@ - PROG_NOINST = dicttest${PROG_SUFFIX} - SRCS = dicttest.c - --include ../../../buildsys.mk -+include ../buildsys.mk - - CPPFLAGS += -I../../libmowgli - LIBS += -L../../libmowgli -lmowgli --- a/src/examples/formattertest/formattertest.c +++ b/src/examples/formattertest/formattertest.c @@ -31,7 +31,7 @@ @@ -30,7 +8,7 @@ Description: This patch makes the examples build standalone. */ -#include <mowgli.h> -+#include <libmowgli/mowgli.h> ++#include <libmowgli-2/mowgli.h> int main(int argc, char *argv[]) { @@ -44,7 +22,7 @@ Description: This patch makes the examples build standalone. +include ../buildsys.mk CPPFLAGS += -I../../libmowgli - LIBS += -L../../libmowgli -lmowgli + LIBS += -L../../libmowgli -lmowgli-2 --- a/src/examples/listsort/listsort.c +++ b/src/examples/listsort/listsort.c @@ -31,7 +31,7 @@ @@ -52,7 +30,7 @@ Description: This patch makes the examples build standalone. */ -#include <mowgli.h> -+#include <libmowgli/mowgli.h> ++#include <libmowgli-2/mowgli.h> #ifdef _WIN32 #define strcasecmp _stricmp @@ -66,11 +44,11 @@ Description: This patch makes the examples build standalone. +include ../buildsys.mk CPPFLAGS += -I../../libmowgli - LIBS += -L../../libmowgli -lmowgli + LIBS += -L../../libmowgli -lmowgli-2 --- a/src/examples/Makefile +++ b/src/examples/Makefile @@ -1,3 +1,3 @@ - SUBDIRS = randomtest listsort formattertest dicttest patriciatest patriciatest2 + SUBDIRS = echoserver vio-udplistener async_resolver formattertest helpertest libevent-bench linetest listsort memslice-bench patriciatest patriciatest2 randomtest timertest futuretest -include ../../buildsys.mk +include buildsys.mk @@ -84,7 +62,7 @@ Description: This patch makes the examples build standalone. +include ../buildsys.mk CPPFLAGS += -I../../libmowgli - LIBS += -L../../libmowgli -lmowgli + LIBS += -L../../libmowgli -lmowgli-2 --- a/src/examples/randomtest/randomtest.c +++ b/src/examples/randomtest/randomtest.c @@ -31,7 +31,7 @@ @@ -92,7 +70,248 @@ Description: This patch makes the examples build standalone. * POSSIBILITY OF SUCH DAMAGE. */ -#include <mowgli.h> -+#include <libmowgli/mowgli.h> ++#include <libmowgli-2/mowgli.h> int main(int argc, char *argv[]) { +--- a/src/examples/async_resolver/async_resolver.c ++++ b/src/examples/async_resolver/async_resolver.c +@@ -1,6 +1,6 @@ + /* This code is in the public domain. */ + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + typedef struct + { +--- a/src/examples/async_resolver/Makefile ++++ b/src/examples/async_resolver/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = async_resolver${PROG_SUFFIX} + SRCS = async_resolver.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/echoserver/echoserver.c ++++ b/src/examples/echoserver/echoserver.c +@@ -21,7 +21,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + mowgli_eventloop_t *base_eventloop; + mowgli_eventloop_pollable_t *listener; +--- a/src/examples/echoserver/Makefile ++++ b/src/examples/echoserver/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = echoserver${PROG_SUFFIX} + SRCS = echoserver.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/futuretest/futuretest.c ++++ b/src/examples/futuretest/futuretest.c +@@ -23,7 +23,7 @@ + + #include <string.h> + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + int main(int argc, char *argv[]) { + char *text = "hello world"; +--- a/src/examples/futuretest/Makefile ++++ b/src/examples/futuretest/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = futuretest${PROG_SUFFIX} + SRCS = futuretest.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/helpertest/helpertest.c ++++ b/src/examples/helpertest/helpertest.c +@@ -21,7 +21,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + int helper_count = 0; + +--- a/src/examples/helpertest/Makefile ++++ b/src/examples/helpertest/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = helpertest${PROG_SUFFIX} + SRCS = helpertest.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/libevent-bench/bench.c ++++ b/src/examples/libevent-bench/bench.c +@@ -73,7 +73,7 @@ + } \ + } while (0) + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + + static int count, writes, fired; +--- a/src/examples/libevent-bench/Makefile ++++ b/src/examples/libevent-bench/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = bench${PROG_SUFFIX} + SRCS = bench.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/linetest/linetest.c ++++ b/src/examples/linetest/linetest.c +@@ -22,7 +22,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + mowgli_eventloop_t *base_eventloop; + char buf[512]; +--- a/src/examples/linetest/Makefile ++++ b/src/examples/linetest/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = linetest${PROG_SUFFIX} + SRCS = linetest.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/memslice-bench/Makefile ++++ b/src/examples/memslice-bench/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = memslice-bench${PROG_SUFFIX} + SRCS = memslice-bench.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/memslice-bench/memslice-bench.c ++++ b/src/examples/memslice-bench/memslice-bench.c +@@ -28,7 +28,7 @@ + } \ + } while (0) + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + mowgli_allocation_policy_t *memslice; + mowgli_allocation_policy_t *sysmalloc; +--- a/src/examples/patriciatest2/Makefile ++++ b/src/examples/patriciatest2/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = patriciatest2${PROG_SUFFIX} + SRCS = patriciatest2.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/patriciatest2/patriciatest2.c ++++ b/src/examples/patriciatest2/patriciatest2.c +@@ -31,7 +31,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + #define TESTSIZE 10000 + +--- a/src/examples/patriciatest/Makefile ++++ b/src/examples/patriciatest/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = patriciatest${PROG_SUFFIX} + SRCS = patriciatest.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/patriciatest/patriciatest.c ++++ b/src/examples/patriciatest/patriciatest.c +@@ -31,7 +31,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + int errors = 0; + +--- a/src/examples/timertest/Makefile ++++ b/src/examples/timertest/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = timertest${PROG_SUFFIX} + SRCS = timertest.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/timertest/timertest.c ++++ b/src/examples/timertest/timertest.c +@@ -21,7 +21,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + mowgli_eventloop_t *eventloop; + +--- a/src/examples/vio-udplistener/Makefile ++++ b/src/examples/vio-udplistener/Makefile +@@ -1,7 +1,7 @@ + PROG_NOINST = vio-udplistener${PROG_SUFFIX} + SRCS = vio-udplistener.c + +-include ../../../buildsys.mk ++include ../buildsys.mk + + CPPFLAGS += -I../../libmowgli + LIBS += -L../../libmowgli -lmowgli-2 +--- a/src/examples/vio-udplistener/vio-udplistener.c ++++ b/src/examples/vio-udplistener/vio-udplistener.c +@@ -3,7 +3,7 @@ + * This example is public domain. + */ + +-#include <mowgli.h> ++#include <libmowgli-2/mowgli.h> + + #define BUFSIZE 2048 + |