bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the last code relating to the old configuration parsing

Browse Source 
system.  The grammar.y and scanner.l files still need to be removed.
This commit is contained in:
Robert James Kaes 2004-08-14 00:37:51 +00:00
parent 52562b49df
commit 9f4323a562
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -1,4 +1,4 @@
dnl $Id: configure.ac,v 2.65 2004-01-26 19:11:52 rjkaes Exp $ dnl $Id: configure.ac,v 2.66 2004-08-14 00:37:51 rjkaes Exp $
dnl Devlopers, please strive to achieve this order: dnl Devlopers, please strive to achieve this order:
dnl dnl
@ -165,8 +165,6 @@ AC_PROG_CC
AC_ISC_POSIX AC_ISC_POSIX
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AM_PROG_LEX
AC_PROG_YACC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
dnl If a CFLAGS variable was passed during configure, set the initial dnl If a CFLAGS variable was passed during configure, set the initial
@ -177,11 +175,6 @@ else
CFLAGS="" CFLAGS=""
fi fi
dnl Make sure YACC is actually bison
if test x"$YACC" != x"bison -y"; then
AC_MSG_WARN([You will need bison if you want to regenerate the parser.])
fi
dnl dnl
dnl Checks for libraries dnl Checks for libraries
dnl dnl
@ -274,16 +267,10 @@ if test x"$debug_enabled" = x"yes" ; then
CFLAGS="-Wmissing-prototypes -Wmissing-declarations $CFLAGS" CFLAGS="-Wmissing-prototypes -Wmissing-declarations $CFLAGS"
CFLAGS="-Wpointer-arith -Waggregate-return -Wnested-externs $CFLAGS" CFLAGS="-Wpointer-arith -Waggregate-return -Wnested-externs $CFLAGS"
fi fi
CFLAGS="-Wall -g -DYYDEBUG $CFLAGS" CFLAGS="-Wall -g $CFLAGS"
YFLAGS="-v -d"
if test x"$ac_cv_prog_LEX" = x"flex" ; then
LEX_FLAGS="--warn --debug"
fi
else else
dnl No debugging information, include the optimizations dnl No debugging information, include the optimizations
CFLAGS="-O2 -DNDEBUG $CFLAGS" CFLAGS="-O2 -DNDEBUG $CFLAGS"
YFLAGS="-d"
fi fi
dnl dnl
@ -345,9 +332,7 @@ dnl Substitute the variables into the various Makefiles
dnl dnl
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(YFLAGS)
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)
AC_SUBST(LEX_FLAGS)
AC_SUBST(LIBS) AC_SUBST(LIBS)
AC_SUBST(ADDITIONAL_OBJECTS) AC_SUBST(ADDITIONAL_OBJECTS)
AC_SUBST(TINYPROXY_CONFIG_DIR) AC_SUBST(TINYPROXY_CONFIG_DIR)

7
src/Makefile.am
View File

@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.20 2004-08-13 21:04:24 rjkaes Exp $ # $Id: Makefile.am,v 1.21 2004-08-14 00:37:50 rjkaes Exp $
# #
# Copyright (C) 2000 Robert James Kaes (rjkaes@flarenet.com) # Copyright (C) 2000 Robert James Kaes (rjkaes@flarenet.com)
# #
@ -13,7 +13,6 @@
# General Public License for more details. # General Public License for more details.
# #
YFLAGS = @YFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
sbin_PROGRAMS = tinyproxy sbin_PROGRAMS = tinyproxy
@ -40,15 +39,11 @@ tinyproxy_SOURCES = \
tinyproxy.c tinyproxy.h \ tinyproxy.c tinyproxy.h \
utils.c utils.h \ utils.c utils.h \
vector.c vector.h vector.c vector.h
# grammar.y scanner.l
EXTRA_tinyproxy_SOURCES = filter.c filter.h grammar.h EXTRA_tinyproxy_SOURCES = filter.c filter.h grammar.h
tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@ tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@
tinyproxy_LDADD = @ADDITIONAL_OBJECTS@ tinyproxy_LDADD = @ADDITIONAL_OBJECTS@
scanner.c: scanner.l grammar.h
$(LEX) $(LEX_FLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@
clean: clean:
rm -f *.da rm -f *.da
rm -f gmon.out rm -f gmon.out