3 files changed, 23 insertions, 15 deletions
diff --git a/doc/specs/Makefile.am b/doc/specs/Makefile.am
index 53641678..440e0076 100644
--- a/doc/specs/Makefile.am
+++ b/doc/specs/Makefile.am
@@ -6,24 +6,19 @@ CLEANFILES = draft-morgan-pam-current.txt *~
 
 EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt
 
-all: draft-morgan-pam-current.txt
-	test -f rfc86.0.txt || cp -p $(srcdir)/rfc86.0.txt .
-
 draft-morgan-pam-current.txt: padout draft-morgan-pam.raw
 	./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt
 
+AM_YFLAGS = -d
+
+BUILT_SOURCES = parse_y.h
+
 noinst_PROGRAMS = padout
 
-padout_SOURCES = parse.y parse.lex
+padout_SOURCES = parse_l.l parse_y.y
 
 padout_LDADD = @LEXLIB@
 
-parse.c: lex.yy.c
-
-lex.yy.c: $(srcdir)/parse.lex
-	$(LEX) $(srcdir)/parse.lex
+specdir = $(DOCDIR)/spec
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/spec
-	$(INSTALL_DATA) draft-morgan-pam-current.txt $(DESTDIR)$(DOCDIR)/spec/
-	$(INSTALL_DATA) rfc86.0.txt $(DESTDIR)$(DOCDIR)/spec/
+spec_DATA = draft-morgan-pam-current.txt rfc86.0.txt
diff --git a/doc/specs/parse.lex b/doc/specs/parse_l.l
index 1d5c898e..7cab424c 100644
--- a/doc/specs/parse.lex
+++ b/doc/specs/parse_l.l
@@ -1,3 +1,13 @@
+%{
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <stdio.h>
+
+#include "parse_y.h"
+%}
+
 %%
 
 \#[\$]+[a-zA-Z]*(\=[0-9]+)?          return NEW_COUNTER;
diff --git a/doc/specs/parse.y b/doc/specs/parse_y.y
index 9d0e2534..9ea51654 100644
--- a/doc/specs/parse.y
+++ b/doc/specs/parse_y.y
@@ -1,5 +1,9 @@
 
 %{
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,13 +16,12 @@
     int line=1;
     char *last_label=NULL;
 
+    extern int yylex(void);
+    extern char *yytext;
     extern void yyerror(const char *x);
     extern char *get_label(const char *label);
     extern void set_label(const char *label, const char *target);
     char *new_counter(const char *key);
-
-#include "lex.yy.c"
-
 %}
 
 %union {