Browse code

- removed the dependency on libfl

Andrei Pelinescu-Onciul authored on 06/03/2006 23:59:28
Showing 2 changed files
... ...
@@ -996,7 +996,7 @@ ifeq ($(YACC),)
996 996
 endif
997 997
 YACC_FLAGS=-d -b cfg
998 998
 # on solaris add -lxnet (e.g. LIBS= -lxnet)
999
-LIBS= -lfl -ldl -lresolv
999
+LIBS= -ldl -lresolv
1000 1000
 
1001 1001
 
1002 1002
 #os specific stuff
... ...
@@ -1058,7 +1058,7 @@ ifeq ($(CC_NAME), suncc)
1058 1058
 endif
1059 1059
 	OLD_SOLARIS= $(shell echo "$(OSREL)" | \
1060 1060
 				sed -e 's/^5\.[0-6][^0-9]*$$/yes/' )
1061
-	LIBS+= -L$(LOCALBASE)/lib -lfl -lxnet -lnsl 
1061
+	LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl 
1062 1062
 ifeq	($(OLD_SOLARIS), yes)
1063 1063
 		LIBS+=-lposix4
1064 1064
 else
... ...
@@ -1075,9 +1075,9 @@ ifeq ($(OS), freebsd)
1075 1075
 	ifneq ($(found_lock_method), yes)
1076 1076
 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
1077 1077
 		found_lock_method=yes
1078
-		LIBS= -pthread -lfl  #dlopen is in libc
1078
+		LIBS= -pthread   #dlopen is in libc
1079 1079
 	else
1080
-		LIBS= -lfl  #dlopen is in libc
1080
+		LIBS=   #dlopen is in libc
1081 1081
 	endif
1082 1082
 	# check for ver >= 4.1
1083 1083
 	ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue)
... ...
@@ -1113,7 +1113,7 @@ ifeq ($(OS), openbsd)
1113 1113
 	YACC=yacc
1114 1114
 	# no sched_yield on openbsd unless linking with c_r (not recommended)
1115 1115
 	# unfortunately pthread is needed for sigwait
1116
-	LIBS= -lfl -lpthread
1116
+	LIBS= -lpthread
1117 1117
 	OPENBSD_IS_AOUT= $(shell echo "$(OSREL)" | \
1118 1118
 				sed -e 's/^3\.[0-3][^0-9]*$$/yes/' |sed -e 's/^[0-2]\..*/yes/')
1119 1119
 # exception: on sparc openbsd 3.2 is elf and not aout
... ...
@@ -1151,7 +1151,7 @@ ifeq ($(OS), netbsd)
1151 1151
 		DEFS+=-DHAVE_SELECT
1152 1152
 	endif
1153 1153
 	YACC=yacc
1154
-	LIBS= -lfl 
1154
+	LIBS=  
1155 1155
 endif
1156 1156
 
1157 1157
 # OS X support, same as freebsd
... ...
@@ -1166,9 +1166,9 @@ ifeq ($(OS), darwin)
1166 1166
 	ifneq ($(found_lock_method), yes)
1167 1167
 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
1168 1168
 		found_lock_method=yes
1169
-		LIBS= -pthread -lfl -lresolv  #dlopen is in libc
1169
+		LIBS= -pthread -lresolv  #dlopen is in libc
1170 1170
 	else
1171
-		LIBS= -lfl -lresolv  #dlopen is in libc
1171
+		LIBS= -lresolv  #dlopen is in libc
1172 1172
 	endif
1173 1173
 	ifeq ($(NO_KQUEUE),)
1174 1174
 		DEFS+=-DHAVE_KQUEUE
... ...
@@ -708,3 +708,10 @@ static void count()
708 708
 	}
709 709
 }
710 710
 
711
+
712
+
713
+/* replacement yywrap, removes libfl dependency */
714
+int yywrap()
715
+{
716
+	return 1;
717
+}