From 36af3c579fb962244fda350e6f54da61aa860c29 Mon Sep 17 00:00:00 2001 From: mtbishop Date: Sat, 7 Jul 2012 05:12:17 +0000 Subject: [PATCH] buyback from pat3540779-5589 --- .cvsignore | 4 ++++ ChangeLog | 1 + Credits | 2 ++ Makefile.in | 8 +++++--- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..9304f7c --- /dev/null +++ b/.cvsignore @@ -0,0 +1,4 @@ +config.status +config.log +config.h +Makefile diff --git a/ChangeLog b/ChangeLog index 10a02b3..ed75979 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ rfe2149137 - makefile ignores LDFLAGS (sbk) rfe2405993 - mem leak in config parser (frY) rfe1685781 - vtun3 server should offer vtun2-compatible encryption (if) + rfe3540779 - Parallel make Makefile.in race condition (pb) 3.0.2: rfe1685781 - vtun3 client should parse vtun2 server encr directives (hch) diff --git a/Credits b/Credits index 3ee8f80..9718ad2 100644 --- a/Credits +++ b/Credits @@ -150,3 +150,5 @@ Yasuyuki Dragos Vingarzan Delayed UDP for unpredictable ports on bad NATs. (rfe2636157) +Sergey Popov (Pinkbyte) <@pinkbyte.ru> + Parallel make Makefile.in race condition (rfe3540779) diff --git a/Makefile.in b/Makefile.in index d2c292f..3835706 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # 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@ CFLAGS = @CFLAGS@ @CPPFLAGS@ @@ -60,10 +60,12 @@ CONFIGURE_FILES = Makefile config.status config.cache config.h config.log vtund: $(OBJS) $(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 -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 depend: