diff -r d1c1a0254e4f -r ad4265253528 stage1_2/Makefile.in
--- a/stage1_2/Makefile.in	Mon Nov 19 22:53:43 2012 +0100
+++ b/stage1_2/Makefile.in	Tue Nov 20 00:01:57 2012 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -64,12 +64,6 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LIBRARIES = $(lib_LIBRARIES)
 AR = ar
@@ -78,7 +72,7 @@
 libstage1_2_a_LIBADD =
 am_libstage1_2_a_OBJECTS = libstage1_2_a-iec_flex.$(OBJEXT) \
 	libstage1_2_a-iec_bison.$(OBJEXT) \
-	libstage1_2_a-derived_conversion_functions.$(OBJEXT) \
+	libstage1_2_a-create_enumtype_conversion_functions.$(OBJEXT) \
 	libstage1_2_a-stage1_2.$(OBJEXT)
 libstage1_2_a_OBJECTS = $(am_libstage1_2_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
@@ -90,9 +84,9 @@
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
 YLWRAP = $(top_srcdir)/config/ylwrap
-YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -215,7 +209,7 @@
 libstage1_2_a_SOURCES = \
 	iec_flex.ll \
 	iec_bison.yy \
-    derived_conversion_functions.cc \
+    create_enumtype_conversion_functions.cc \
 	stage1_2.cc 
 
 libstage1_2_a_CPPFLAGS = -DDEFAULT_LIBDIR='"lib"' -I../../absyntax
@@ -245,7 +239,6 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/../common.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -281,14 +274,18 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \
+	cd "$(DESTDIR)$(libdir)" && rm -f $$files
 
 clean-libLIBRARIES:
 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
 iec_bison.h: iec_bison.cc
-	@if test ! -f $@; then rm -f iec_bison.cc; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) iec_bison.cc; else :; fi
-libstage1_2.a: $(libstage1_2_a_OBJECTS) $(libstage1_2_a_DEPENDENCIES) $(EXTRA_libstage1_2_a_DEPENDENCIES) 
+	@if test ! -f $@; then \
+	  rm -f iec_bison.cc; \
+	  $(MAKE) $(AM_MAKEFLAGS) iec_bison.cc; \
+	else :; fi
+libstage1_2.a: $(libstage1_2_a_OBJECTS) $(libstage1_2_a_DEPENDENCIES) 
 	-rm -f libstage1_2.a
 	$(libstage1_2_a_AR) libstage1_2.a $(libstage1_2_a_OBJECTS) $(libstage1_2_a_LIBADD)
 	$(RANLIB) libstage1_2.a
@@ -299,7 +296,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstage1_2_a-derived_conversion_functions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstage1_2_a-create_enumtype_conversion_functions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstage1_2_a-iec_bison.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstage1_2_a-iec_flex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstage1_2_a-stage1_2.Po@am__quote@
@@ -346,19 +343,19 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libstage1_2_a-iec_bison.obj `if test -f 'iec_bison.cc'; then $(CYGPATH_W) 'iec_bison.cc'; else $(CYGPATH_W) '$(srcdir)/iec_bison.cc'; fi`
 
-libstage1_2_a-derived_conversion_functions.o: derived_conversion_functions.cc
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libstage1_2_a-derived_conversion_functions.o -MD -MP -MF $(DEPDIR)/libstage1_2_a-derived_conversion_functions.Tpo -c -o libstage1_2_a-derived_conversion_functions.o `test -f 'derived_conversion_functions.cc' || echo '$(srcdir)/'`derived_conversion_functions.cc
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libstage1_2_a-derived_conversion_functions.Tpo $(DEPDIR)/libstage1_2_a-derived_conversion_functions.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='derived_conversion_functions.cc' object='libstage1_2_a-derived_conversion_functions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libstage1_2_a-derived_conversion_functions.o `test -f 'derived_conversion_functions.cc' || echo '$(srcdir)/'`derived_conversion_functions.cc
-
-libstage1_2_a-derived_conversion_functions.obj: derived_conversion_functions.cc
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libstage1_2_a-derived_conversion_functions.obj -MD -MP -MF $(DEPDIR)/libstage1_2_a-derived_conversion_functions.Tpo -c -o libstage1_2_a-derived_conversion_functions.obj `if test -f 'derived_conversion_functions.cc'; then $(CYGPATH_W) 'derived_conversion_functions.cc'; else $(CYGPATH_W) '$(srcdir)/derived_conversion_functions.cc'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libstage1_2_a-derived_conversion_functions.Tpo $(DEPDIR)/libstage1_2_a-derived_conversion_functions.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='derived_conversion_functions.cc' object='libstage1_2_a-derived_conversion_functions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libstage1_2_a-derived_conversion_functions.obj `if test -f 'derived_conversion_functions.cc'; then $(CYGPATH_W) 'derived_conversion_functions.cc'; else $(CYGPATH_W) '$(srcdir)/derived_conversion_functions.cc'; fi`
+libstage1_2_a-create_enumtype_conversion_functions.o: create_enumtype_conversion_functions.cc
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libstage1_2_a-create_enumtype_conversion_functions.o -MD -MP -MF $(DEPDIR)/libstage1_2_a-create_enumtype_conversion_functions.Tpo -c -o libstage1_2_a-create_enumtype_conversion_functions.o `test -f 'create_enumtype_conversion_functions.cc' || echo '$(srcdir)/'`create_enumtype_conversion_functions.cc
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libstage1_2_a-create_enumtype_conversion_functions.Tpo $(DEPDIR)/libstage1_2_a-create_enumtype_conversion_functions.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='create_enumtype_conversion_functions.cc' object='libstage1_2_a-create_enumtype_conversion_functions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libstage1_2_a-create_enumtype_conversion_functions.o `test -f 'create_enumtype_conversion_functions.cc' || echo '$(srcdir)/'`create_enumtype_conversion_functions.cc
+
+libstage1_2_a-create_enumtype_conversion_functions.obj: create_enumtype_conversion_functions.cc
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libstage1_2_a-create_enumtype_conversion_functions.obj -MD -MP -MF $(DEPDIR)/libstage1_2_a-create_enumtype_conversion_functions.Tpo -c -o libstage1_2_a-create_enumtype_conversion_functions.obj `if test -f 'create_enumtype_conversion_functions.cc'; then $(CYGPATH_W) 'create_enumtype_conversion_functions.cc'; else $(CYGPATH_W) '$(srcdir)/create_enumtype_conversion_functions.cc'; fi`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libstage1_2_a-create_enumtype_conversion_functions.Tpo $(DEPDIR)/libstage1_2_a-create_enumtype_conversion_functions.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='create_enumtype_conversion_functions.cc' object='libstage1_2_a-create_enumtype_conversion_functions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libstage1_2_a-create_enumtype_conversion_functions.obj `if test -f 'create_enumtype_conversion_functions.cc'; then $(CYGPATH_W) 'create_enumtype_conversion_functions.cc'; else $(CYGPATH_W) '$(srcdir)/create_enumtype_conversion_functions.cc'; fi`
 
 libstage1_2_a-stage1_2.o: stage1_2.cc
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstage1_2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libstage1_2_a-stage1_2.o -MD -MP -MF $(DEPDIR)/libstage1_2_a-stage1_2.Tpo -c -o libstage1_2_a-stage1_2.o `test -f 'stage1_2.cc' || echo '$(srcdir)/'`stage1_2.cc
@@ -481,15 +478,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic: