From ab8f70150e1b4aa41032415dd77c14a2950476f5 Mon Sep 17 00:00:00 2001 From: Marenz Date: Sun, 8 May 2011 23:40:26 +0200 Subject: [PATCH] moved debug.h lib.h to src --- {include/psyc => src}/debug.h | 0 {include/psyc => src}/lib.h | 2 +- src/match.c | 2 +- src/packet.c | 2 +- src/parser.c | 2 +- src/render.c | 6 +++--- src/text.c | 2 +- src/variable.c | 2 +- test/Makefile | 2 +- test/getVarType.c | 2 +- test/isRoutingVar.c | 2 +- test/testMatch.c | 2 +- test/testRender.c | 2 +- test/testText.c | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) rename {include/psyc => src}/debug.h (100%) rename {include/psyc => src}/lib.h (96%) diff --git a/include/psyc/debug.h b/src/debug.h similarity index 100% rename from include/psyc/debug.h rename to src/debug.h diff --git a/include/psyc/lib.h b/src/lib.h similarity index 96% rename from include/psyc/lib.h rename to src/lib.h index dfa017b..ba7808c 100644 --- a/include/psyc/lib.h +++ b/src/lib.h @@ -3,7 +3,7 @@ #ifndef PSYC_LIB_H # define PSYC_LIB_H -#include "../psyc.h" +#include #include "./debug.h" #include diff --git a/src/match.c b/src/match.c index 22d6ced..7fc3c25 100644 --- a/src/match.c +++ b/src/match.c @@ -1,4 +1,4 @@ -#include "psyc/lib.h" +#include "lib.h" int psyc_inherits(char* sho, size_t slen, char* lon, size_t llen) { diff --git a/src/packet.c b/src/packet.c index aed1aa5..fe7c13e 100644 --- a/src/packet.c +++ b/src/packet.c @@ -1,4 +1,4 @@ -#include +#include "lib.h" #include #include diff --git a/src/parser.c b/src/parser.c index 4e50dce..b447750 100644 --- a/src/parser.c +++ b/src/parser.c @@ -5,7 +5,7 @@ #include #endif -#include +#include "lib.h" #include #define ADVANCE_CURSOR_OR_RETURN(ret) \ diff --git a/src/render.c b/src/render.c index 5990f4b..c0e0a77 100644 --- a/src/render.c +++ b/src/render.c @@ -1,6 +1,6 @@ -#include "psyc/lib.h" -#include "psyc/render.h" -#include "psyc/syntax.h" +#include "lib.h" +#include +#include psycRenderRC psyc_renderList (psycList *list, char *buffer, size_t buflen) { diff --git a/src/text.c b/src/text.c index 674890b..70a437b 100644 --- a/src/text.c +++ b/src/text.c @@ -1,4 +1,4 @@ -#include +#include "lib.h" #include psycTextRC psyc_text (psycTextState *state, psycTextCB getValue) diff --git a/src/variable.c b/src/variable.c index a30805d..a1e4845 100644 --- a/src/variable.c +++ b/src/variable.c @@ -1,4 +1,4 @@ -#include +#include "lib.h" #include /// Routing variables in alphabetical order. diff --git a/test/Makefile b/test/Makefile index 749fd75..8217eb5 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,6 +1,6 @@ OPT = -O2 DEBUG = 2 -CFLAGS = -I../include -Wall -std=c99 ${OPT} +CFLAGS = -I../include -I../src -Wall -std=c99 ${OPT} LDFLAGS = -L../lib LOADLIBES = -lpsyc -lm LOADLIBES_NET = ${LOADLIBES} diff --git a/test/getVarType.c b/test/getVarType.c index bdf6d3c..d0fd152 100644 --- a/test/getVarType.c +++ b/test/getVarType.c @@ -2,7 +2,7 @@ #include #include #include -#include "../include/psyc/lib.h" +#include int main() { unless (psyc_getVarType(PSYC_C2ARG("_list"))) return 1; diff --git a/test/isRoutingVar.c b/test/isRoutingVar.c index f2d0ceb..9c31685 100644 --- a/test/isRoutingVar.c +++ b/test/isRoutingVar.c @@ -2,7 +2,7 @@ #include #include #include -#include "../include/psyc/lib.h" +#include int main() { #if 0 diff --git a/test/testMatch.c b/test/testMatch.c index cdac58a..6874e14 100644 --- a/test/testMatch.c +++ b/test/testMatch.c @@ -1,5 +1,5 @@ #include -#include "../include/psyc/lib.h" +#include int main() { if (psyc_matches(PSYC_C2ARG("_failure_delivery"), PSYC_C2ARG("_failure_unsuccessful_delivery_death"))) return 1; diff --git a/test/testRender.c b/test/testRender.c index edfb798..1f1f61b 100644 --- a/test/testRender.c +++ b/test/testRender.c @@ -1,6 +1,6 @@ #include -#include +#include #include #include diff --git a/test/testText.c b/test/testText.c index e5aff36..21f732d 100644 --- a/test/testText.c +++ b/test/testText.c @@ -1,6 +1,6 @@ #include -#include +#include #include #define BUFSIZE 512