buyback from pat3540779-5589

This commit is contained in:
mtbishop 2012-07-07 05:12:17 +00:00
parent 38bca6e29f
commit 36af3c579f
4 changed files with 12 additions and 3 deletions

4
.cvsignore Normal file
View File

@ -0,0 +1,4 @@
config.status
config.log
config.h
Makefile

View File

@ -3,6 +3,7 @@
rfe2149137 - makefile ignores LDFLAGS (sbk) rfe2149137 - makefile ignores LDFLAGS (sbk)
rfe2405993 - mem leak in config parser (frY) rfe2405993 - mem leak in config parser (frY)
rfe1685781 - vtun3 server should offer vtun2-compatible encryption (if) rfe1685781 - vtun3 server should offer vtun2-compatible encryption (if)
rfe3540779 - Parallel make Makefile.in race condition (pb)
3.0.2: 3.0.2:
rfe1685781 - vtun3 client should parse vtun2 server encr directives (hch) rfe1685781 - vtun3 client should parse vtun2 server encr directives (hch)

View File

@ -150,3 +150,5 @@ Yasuyuki <fryasu@yahoo.co.jp>
Dragos Vingarzan <dragos.vingarzan@gmail.com> Dragos Vingarzan <dragos.vingarzan@gmail.com>
Delayed UDP for unpredictable ports on bad NATs. (rfe2636157) Delayed UDP for unpredictable ports on bad NATs. (rfe2636157)
Sergey Popov (Pinkbyte) <@pinkbyte.ru>
Parallel make Makefile.in race condition (rfe3540779)

View File

@ -15,7 +15,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# $Id: Makefile.in,v 1.11.2.4 2008/12/08 11:25:17 mtbishop Exp $ # $Id: Makefile.in,v 1.11.2.5 2012/07/07 05:12:17 mtbishop Exp $
# #
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ @CPPFLAGS@ CFLAGS = @CFLAGS@ @CPPFLAGS@
@ -60,10 +60,12 @@ CONFIGURE_FILES = Makefile config.status config.cache config.h config.log
vtund: $(OBJS) vtund: $(OBJS)
$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS) $(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h cfg_file.tab.h:
$(YACC) $(YACCFLAGS) -b cfg_file cfg_file.y $(YACC) $(YACCFLAGS) -b cfg_file cfg_file.y
cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h cfg_file.tab.h
cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h cfg_file.tab.h
$(LEX) $(LEXFLAGS) cfg_file.l > cfg_file.lex.c $(LEX) $(LEXFLAGS) cfg_file.l > cfg_file.lex.c
depend: depend: