patch file cleanup... ick.. kaloz you owe me some love
[openwrt/svn-archive/archive.git] / net / openser / patches / 003-makefile_defs.patch
1 --- openser-1.0.0-tls.orig/Makefile.defs 2005-10-28 18:32:39.000000000 +0200
2 +++ openser-1.0.0-tls/Makefile.defs 2006-01-15 23:40:18.391547040 +0100
3 @@ -917,7 +917,7 @@
4 endif
5 YACC_FLAGS=-d -b cfg
6 # on solaris add -lxnet (e.g. LIBS= -lxnet)
7 -LIBS= -lfl -ldl -lresolv
8 +LIBS= -ldl -lresolv
9
10
11 #os specific stuff
12 @@ -955,7 +955,7 @@
13 endif
14 OLD_SOLARIS= $(shell echo "$(OSREL)" | \
15 sed -e 's/^5\.[0-6][^0-9]*$$/yes/' )
16 - LIBS+= -L$(LOCALBASE)/lib -lfl -lxnet -lnsl
17 + LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl
18 ifeq ($(OLD_SOLARIS), yes)
19 LIBS+=-lposix4
20 else
21 @@ -970,9 +970,9 @@
22 ifneq ($(found_lock_method), yes)
23 DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
24 found_lock_method=yes
25 - LIBS= -pthread -lfl #dlopen is in libc
26 + LIBS= -pthread #dlopen is in libc
27 else
28 - LIBS= -lfl #dlopen is in libc
29 + LIBS= #dlopen is in libc
30 endif
31 YACC=yacc
32 endif
33 @@ -987,7 +987,7 @@
34 # (symbols on openbsd are prefixed by "_")
35 YACC=yacc
36 # no sched_yield on openbsd unless linking with c_r (not recommended)
37 - LIBS= -lfl
38 + LIBS=
39 OPENBSD_IS_AOUT= $(shell echo "$(OSREL)" | \
40 sed -e 's/^3\.[0-3][^0-9]*$$/yes/' |sed -e 's/^[0-2]\..*/yes/')
41 # exception: on sparc openbsd 3.2 is elf and not aout
42 @@ -1014,7 +1014,7 @@
43 found_lock_method=yes
44 endif
45 YACC=yacc
46 - LIBS= -lfl
47 + LIBS=
48 endif
49
50 # OS X support, same as freebsd
51 @@ -1028,9 +1028,9 @@
52 ifneq ($(found_lock_method), yes)
53 DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
54 found_lock_method=yes
55 - LIBS= -pthread -lfl -lresolv #dlopen is in libc
56 + LIBS= -pthread -lresolv #dlopen is in libc
57 else
58 - LIBS= -lfl -lresolv #dlopen is in libc
59 + LIBS= -lresolv #dlopen is in libc
60 endif
61 LDFLAGS= # darwin doesn't like -O2 or -E
62 MOD_LDFLAGS= -bundle -bundle_loader ../../$(MAIN_NAME)
63 @@ -1047,7 +1047,7 @@
64
65 #add libssl if needed
66 ifneq ($(TLS),)
67 -DEFS+= -I$(LOCALBASE)/ssl/include
68 +DEFS+= -I$(LOCALBASE)/include
69 LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto
70 endif
71