20000731-09:00 GMT+2 Maurilio Longo <maurilio.longo@libero.it>

harbour/ChangeLog

@@ -1,3 +1,9 @@
+20000731-09:00 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
+   * source/macro/Makefile
+     + added macroslx.c compilation instead of flex lexer if HB_LEX is set to SIMPLEX
+   * source/macro/macroslx.c
+     + added relative path in include commands to let gcc find correct files
+
 2000-07-30 22:50 UTC+0800 Ron Pinkas <ron@profit-master.com>
   * source/macro/macro.slx
     ! Corrected unreleased memory block.

harbour/source/macro/Makefile

@@ -1,43 +1,105 @@
 #
+
 # $Id$
+
 #
 
+
+
 ROOT = ../../
 
+
+
 YACC_FLAGS = -p hb_comp
 
+
+
 YACC_SOURCE=macro.y
 
+
+
 YACC_HEADERS=\
+
 	hbmacro.h \
+
 	hbsetup.h \
+
 	hbpcode.h \
+
 	hbdefs.h \
 
+
+
+ifeq ($(HB_LEX),SIMPLEX)
+
+
+
+C_EXTRA=macroslx.c
+
+
+
+else
+
+
+
 #NOTE: You can pass additional parameters that control the speed/size
+
 # ratio of generated flex scanner. These parameters are:
+
 # -Cf   - fastest/biggest
+
 # -CF
+
 # -C    - in between
+
 # -Cm
+
 # -Ce
+
 # -Cem  - slowest/smallest
+
 # see Flex documentation for full set of switches
+
 LEX_FLAGS = -Phb_comp -C
 
+
+
 LEX_SOURCE=macro.l
 
+
+
 LEX_HEADERS=\
+
 	hbsetup.h \
+
 	hberrors.h \
+
 	hbdefs.h \
+
 	hbmacro.h \
 
+
+
+endif
+
+
+
 C_SOURCES=\
+
 	macroa.c \
+
 	macrob.c \
+
 	macroc.c \
 
+	$(C_EXTRA)
+
+
+
 LIBNAME=macro
 
+
+
 include $(TOP)$(ROOT)config/lib.cf
+
+

harbour/source/macro/macroslx.c

@@ -13,6 +13,8 @@
 #include "hberrors.h"
 #include "hbdefs.h"
 
-#define SLX_RULES "macro.slx"
+/* this is relative to position of simplex.c in harbour source tree */
+#define SLX_RULES "../macro/macro.slx"
 
-#include "simplex.c"
+/* this is relative to position of macroslx.c in harbour source tree */
+#include "../compiler/simplex.c"