configure: retire --disable-model-files to simplify distribution

configure.ac

@@ -308,34 +308,6 @@ else
    AM_CONDITIONAL([OCAMLDEP_AVAILABLE],[false])
 fi
 
-###---------------------------------------------------------------------
-### Model files
-
-AC_ARG_ENABLE([model-files],
-  [AS_HELP_STRING([--enable-model-files],
-    [build the development code for model files (developers only) [[yes]]])],
-    [],
-    [enable_model_files=yes])
-
-AC_CACHE_CHECK([whether we want to build the development code for model files], 
-[wo_cv_model_files],
-[dnl
-if test "$enable_model_files" = "yes"; then
-  wo_cv_model_files=yes
-else
-  wo_cv_model_files=no
-fi])
-
-AM_CONDITIONAL([MODEL_FILES],
-  [test "$enable_model_files" = "yes"])
-
-if test "$enable_model_files" = "yes"; then
-  comment_model_file=""
-else
-  comment_model_file="#"
-fi
-AC_SUBST([comment_model_file])
-
 ########################################################################
 # Copy config.mli to the build directory (otherwise ocamlc and/or
 # ocamlopt would create one on their own).

src/Makefile.sources

@@ -58,17 +58,17 @@ CASCADE_MLD = $(CASCADE_MLL:.mll=.ml) $(CASCADE_MLY:.mly=.ml)
 CASCADE_ML_PRIMARY = cascade_syntax.ml cascade.ml
 CASCADE_ML = cascade_syntax.ml $(CASCADE_MLD) cascade.ml
 
-VERTEX_MLL = @comment_model_file@ vertex_lexer.mll
-VERTEX_MLY = @comment_model_file@ vertex_parser.mly
+VERTEX_MLL = vertex_lexer.mll
+VERTEX_MLY = vertex_parser.mly
 VERTEX_MLD = $(VERTEX_MLL:.mll=.ml) $(VERTEX_MLY:.mly=.ml)
-VERTEX_ML_PRIMARY = @comment_model_file@ vertex_syntax.ml vertex.ml
-VERTEX_ML = @comment_model_file@ vertex_syntax.ml $(VERTEX_MLD) vertex.ml
+VERTEX_ML_PRIMARY = vertex_syntax.ml vertex.ml
+VERTEX_ML = vertex_syntax.ml $(VERTEX_MLD) vertex.ml
 
-UFO_MLL = @comment_model_file@ uFOx_lexer.mll uFO_lexer.mll
-UFO_MLY = @comment_model_file@ uFOx_parser.mly uFO_parser.mly
+UFO_MLL = uFOx_lexer.mll uFO_lexer.mll
+UFO_MLY = uFOx_parser.mly uFO_parser.mly
 UFO_MLD = $(UFO_MLL:.mll=.ml) $(UFO_MLY:.mly=.ml)
-UFO_ML_PRIMARY = @comment_model_file@ uFOx_syntax.ml uFOx.ml uFO_syntax.ml uFO.ml
-UFO_ML = @comment_model_file@ uFOx_syntax.ml uFO_syntax.ml $(UFO_MLD) uFOx.ml uFO.ml
+UFO_ML_PRIMARY = uFOx_syntax.ml uFOx.ml uFO_syntax.ml uFO.ml
+UFO_ML = uFOx_syntax.ml uFO_syntax.ml $(UFO_MLD) uFOx.ml uFO.ml
 
 OMEGA_MLL = $(CASCADE_MLL) $(VERTEX_MLL) $(UFO_MLL)
 OMEGA_MLY = $(CASCADE_MLY) $(VERTEX_MLY) $(UFO_MLY)

tests/Makefile.am

@@ -514,10 +514,9 @@ amplitude_benchmark_v1.o amplitude_benchmark_v2.o \
 
 if OCAML_AVAILABLE
 
-TESTS += @comment_model_file@ vertex_unit
-@comment_model_file@ EXTRA_PROGRAMS += vertex_unit
-
-@comment_model_file@ vertex_unit_SOURCES = vertex_unit.ml
+TESTS += vertex_unit
+EXTRA_PROGRAMS += vertex_unit
+vertex_unit_SOURCES = vertex_unit.ml
 
 vertex_unit: $(OMEGA_CORE) vertex_unit.cmx
 	$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) -o vertex_unit \
@@ -532,10 +531,9 @@ endif
 
 if OCAML_AVAILABLE
 
-TESTS += @comment_model_file@ ufo_unit
-@comment_model_file@ EXTRA_PROGRAMS += ufo_unit
-
-@comment_model_file@ ufo_unit_SOURCES = ufo_unit.ml
+TESTS += ufo_unit
+EXTRA_PROGRAMS += ufo_unit
+ufo_unit_SOURCES = ufo_unit.ml
 
 ufo_unit: $(OMEGA_CORE) ufo_unit.cmx
 	$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) -o ufo_unit \