fix building

This allows the library to be linked with other libraries that also
use flex and bison.

Makefile.am

@@ -7,8 +7,7 @@ libdice_la_SOURCES =	lib/dice_lexer.l \
 			lib/dice_parse.y \
 			lib/dice.h \
 			lib/dice.c \
-			lib/diceexpr.c \
-			lex.dp.c
+			lib/diceexpr.c
 
 include_HEADERS =	lib/dice.h
 

autogen.sh

@@ -3,6 +3,11 @@
 set -e
 set -x
 
+if [ $(uname) = "OpenBSD" ]; then
+    export AUTOMAKE_VERSION=1.15
+    export AUTOCONF_VERSION=2.69
+fi
+
 cd "$(dirname "$0")"
 
 PATH=$PATH:/usr/local/bin

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([libdice], [0.1], [florian@n0la.org])
+AC_INIT([libdice], [0.2], [florian@n0la.org])
 AM_INIT_AUTOMAKE([subdir-objects])
 LT_INIT()
 AC_CONFIG_HEADERS([config.h])

lib/dice_lexer.c

@@ -1,2 +0,0 @@
-/* empty file, so that autotools has something to compile
- */

lib/dice_lexer.l

@@ -1,6 +1,6 @@
-%option prefix="dp"
 %option bison-bridge
 %option reentrant
+%option outfile="../lib/dice_lexer.c"
 
 %{
 #define YYSTYPE DPSTYPE

libdice.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: libdice
 Description: dice rolling and math expression library
-Version: 0.1
+Version: @VERSION@
 Requires:
 Conflicts:
 Cflags: -I${includedir}