Removed m4 from test-table-opts

diff --git a/tests/test-table-opts/Makefile.am b/tests/test-table-opts/Makefile.am
index 4380e3d38d376957074d6899b0a705752f2d8b71..3deb3babc274541d282db0e6eb6970522ec0da19 100644 (file)
--- a/tests/test-table-opts/Makefile.am
+++ b/tests/test-table-opts/Makefile.am
@@ -122,8 +122,14 @@ test-mul: $(serexe)
                ./$$t all-ser.tables < $(srcdir)/test.input || { echo $$t FAILED; exit 1; } ;  \
        done
 
-.c.o:
-       $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $<
+test-opt-nr-%.o: test-opt-nr-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $<
+test-ser-nr-%.o: test-ser-nr-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL $(CFLAGS) $<
+test-ver-nr-%.o: test-ver-nr-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL $(CFLAGS) $<
+
+test-opt-r-%.o:  test-opt-r-%.c  ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_IS_REENTRANT $(CFLAGS) $<
+test-ser-r-%.o:  test-ser-r-%.c  ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT $(CFLAGS) $<
+test-ver-r-%.o:  test-ver-r-%.c  ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT $(CFLAGS) $<
+
 
 .PHONY: test-table-opts test test-opt test-ser test-ver test-mul
 .SECONDARY: $(allobj) $(allsrc)

diff --git a/tests/test-table-opts/scanner.l b/tests/test-table-opts/scanner.l
index 5b3255fcd6fc4b02c190d9c409a0925b949fe044..a9a87c6be5b31cf5a53cd82444adf913012ed0e5 100644 (file)
--- a/tests/test-table-opts/scanner.l
+++ b/tests/test-table-opts/scanner.l
@@ -48,13 +48,11 @@ int main ( int argc, char** argv )
     void *yyscanner=0;
     M4_YY_DECL_GUTS_VAR();
     
-m4_ifdef( [[M4_YY_REENTRANT]],
-[[
+#ifdef TEST_IS_REENTRANT
     yylex_init(&yyscanner);
-]])
+#endif
 
-m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
-[[
+#ifdef TEST_HAS_TABLES_EXTERNAL
     if((fp  = fopen(argv[1],"r"))== NULL)
         yy_fatal_error("could not open tables file for reading" M4_YY_CALL_LAST_ARG);
 
@@ -62,7 +60,7 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
         yy_fatal_error("yytables_fload returned < 0" M4_YY_CALL_LAST_ARG);
     if(M4_YY_TABLES_VERIFY)
         exit(0);
-]])
+#endif
     
     if(argc > 2){
         if((fp  = fopen(argv[2],"r"))== NULL)
@@ -72,10 +70,9 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
     while(yylex(M4_YY_CALL_ONLY_ARG) != 0)
         ;
         
-m4_ifdef( [[YY_TABLES_EXTERNAL]],
-[[
+#ifdef TEST_HAS_TABLES_EXTERNAL
     yytables_destroy(M4_YY_CALL_ONLY_ARG);
-]])
+#endif
     yylex_destroy(M4_YY_CALL_ONLY_ARG);
 
     if(argc < 0) /* silence the compiler */