psyc-mirrors/libpsyc
1
0
Fork 0
mirror of git://git.psyc.eu/libpsyc synced 2024-08-15 03:19:02 +00:00
Code Issues Releases Wiki Activity

makefile fixes for solaris

Browse source
This commit is contained in:
Gabor Adam Toth 2011-05-08 04:11:36 +02:00
parent 86cae5ed7d
commit 1ebcb8b17d
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -25,8 +25,8 @@ doc:
doxygen doxygen
clean: clean:
make -C src clean ${MAKE} -C src clean
make -C test clean ${MAKE} -C test clean
rm -rf doc/html doc/latex doc/man rm -rf doc/html doc/latex doc/man
help: help:

5
include/psyc/lib.h
View file

@ -5,7 +5,6 @@
#include "../psyc.h" #include "../psyc.h"
#include "./debug.h" #include "./debug.h"
#include <sys/cdefs.h>
#include <assert.h> #include <assert.h>
/* perlisms for readability */ /* perlisms for readability */
@ -14,11 +13,11 @@
#define PSYC_NUM_ELEM(a) (sizeof(a) / sizeof(*(a))) #define PSYC_NUM_ELEM(a) (sizeof(a) / sizeof(*(a)))
#if !defined(_GNU_SOURCE) && !defined(__FBSDID) #if !defined(__USE_GNU) && !(defined(__FBSDID) && defined(__BSD_VISIBLE))
void * memmem(const void *l, size_t l_len, const void *s, size_t s_len); void * memmem(const void *l, size_t l_len, const void *s, size_t s_len);
#endif #endif
#if !defined(_GNU_SOURCE) && !defined(__FBSDID) #if !defined(__USE_GNU) && !(defined(__FBSDID) && defined(__BSD_VISIBLE))
int itoa(int number, char* out, int base); int itoa(int number, char* out, int base);
#endif #endif

15
test/Makefile
View file

@ -2,13 +2,22 @@ OPT = -O2
DEBUG = 2 DEBUG = 2
CFLAGS = -I../include -Wall -std=c99 ${OPT} CFLAGS = -I../include -Wall -std=c99 ${OPT}
LDFLAGS = -L../lib LDFLAGS = -L../lib
LOADLIBES = -lpsyc -lm
TARGETS = testServer testParser testMatch testRender testText isRoutingVar getVarType TARGETS = testServer testParser testMatch testRender testText isRoutingVar getVarType
WRAPPER = WRAPPER =
DIET = diet DIET = diet
PORT = 4440 PORT = 4440
LOADLIBES = -lpsyc -lm
ifeq ($(shell uname),SunOS)
LOADLIBES_NET = ${LOADLIBES} -lsocket -lnsl
else
LOADLIBES_NET = ${LOADLIBES}
endif
all: ${TARGETS} all: ${TARGETS}
it: all
testServer: LOADLIBES := ${LOADLIBES_NET}
diet: WRAPPER = ${DIET} diet: WRAPPER = ${DIET}
diet: all diet: all
@ -20,8 +29,6 @@ debug: all
clean: clean:
rm -f ${TARGETS} rm -f ${TARGETS}
it: all
test: ${TARGETS} test: ${TARGETS}
./testRender ./testRender
./testMatch ./testMatch
@ -53,4 +60,4 @@ srvstartr:
./testServer ${PORT} -r & ./testServer ${PORT} -r &
srvkill: srvkill:
killall testServer pkill -x testServer