From 0ac39033c7470f7301bb108f8e777c7ce6af273f Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Sun, 9 Aug 2009 19:43:15 +0200
Subject: Missing dependency added.

---
 conf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/Makefile b/conf/Makefile
index dae3dd1..1b8bc71 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -23,7 +23,7 @@ keywords.h: $(conf-fragments) $(conf-src)/gen_keywords.m4
 commands.h: $(conf-fragments) $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4
 	$(M4) -P $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4 $(conf-fragments) | sort >commands.h
 
-cf-lex.c: cf-lex.l
+cf-lex.c: cf-lex.l cf-parse-tab.h
 	$(FLEX) $(FLEX_DEBUG) -s -B -8 -ocf-lex.c -Pcf_ cf-lex.l
 
 depend: keywords.h commands.h cf-parse.tab.c cf-lex.c
-- 
cgit v1.2.3


From 5b1f877e6edfb3b541d444ae5b1ffd025dd9fbd6 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 10 Aug 2009 12:04:25 +0200
Subject: Fixes typo in Makefile

---
 conf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/Makefile b/conf/Makefile
index 1b8bc71..b3d921d 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -11,7 +11,7 @@ BISON_DEBUG=-t
 #FLEX_DEBUG=-d
 endif
 
-cf-parse.tab.c cf-parse-tab.h: cf-parse.y
+cf-parse.tab.c cf-parse.tab.h: cf-parse.y
 	$(BISON) -bcf-parse -dv -pcf_ $(BISON_DEBUG) cf-parse.y
 
 cf-parse.y: $(conf-fragments) $(conf-src)/gen_parser.m4
@@ -23,7 +23,7 @@ keywords.h: $(conf-fragments) $(conf-src)/gen_keywords.m4
 commands.h: $(conf-fragments) $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4
 	$(M4) -P $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4 $(conf-fragments) | sort >commands.h
 
-cf-lex.c: cf-lex.l cf-parse-tab.h
+cf-lex.c: cf-lex.l cf-parse.tab.h
 	$(FLEX) $(FLEX_DEBUG) -s -B -8 -ocf-lex.c -Pcf_ cf-lex.l
 
 depend: keywords.h commands.h cf-parse.tab.c cf-lex.c
-- 
cgit v1.2.3


From ea9097eaad7dfccd5a88480d748781d947b25cc8 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 10 Aug 2009 14:13:28 +0200
Subject: Fixes parallel runs of Bison.

Previous version of Makefile executed Bison two times (in parallel),
because of two specified targets. I am not sure wheter this is the best
fix.

Previon
---
 conf/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/Makefile b/conf/Makefile
index b3d921d..96975eb 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -11,7 +11,9 @@ BISON_DEBUG=-t
 #FLEX_DEBUG=-d
 endif
 
-cf-parse.tab.c cf-parse.tab.h: cf-parse.y
+cf-parse.tab.h: cf-parse.tab.c
+
+cf-parse.tab.c: cf-parse.y
 	$(BISON) -bcf-parse -dv -pcf_ $(BISON_DEBUG) cf-parse.y
 
 cf-parse.y: $(conf-fragments) $(conf-src)/gen_parser.m4
-- 
cgit v1.2.3


From e75d3c74a8f665a6e7dc0cc743a68e980e7c10da Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 10 Aug 2009 14:36:30 +0200
Subject: Flex does not need the output of Bison.

---
 conf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/Makefile b/conf/Makefile
index 96975eb..5d729a4 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -25,7 +25,7 @@ keywords.h: $(conf-fragments) $(conf-src)/gen_keywords.m4
 commands.h: $(conf-fragments) $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4
 	$(M4) -P $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4 $(conf-fragments) | sort >commands.h
 
-cf-lex.c: cf-lex.l cf-parse.tab.h
+cf-lex.c: cf-lex.l
 	$(FLEX) $(FLEX_DEBUG) -s -B -8 -ocf-lex.c -Pcf_ cf-lex.l
 
 depend: keywords.h commands.h cf-parse.tab.c cf-lex.c
-- 
cgit v1.2.3