[Z88dk-commits] CVS: z88dk/src/z80asm Makefile,1.135,1.136

Bridge to the z88dk-commits mailing list
Post Reply
pauloscustodio

[Z88dk-commits] CVS: z88dk/src/z80asm Makefile,1.135,1.136

Post by pauloscustodio »

Update of /cvsroot/z88dk/z88dk/src/z80asm
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19384

Modified Files:
Makefile
Log Message:
Moved astyle to dev/Makefile
Added code to generate scan_rules.h from scan_rules.rl by calling preprocessor and ragel.

Index: Makefile
===================================================================
RCS file: /cvsroot/z88dk/z88dk/src/z80asm/Makefile,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** Makefile 11 Mar 2014 22:59:20 -0000 1.135
--- Makefile 29 Mar 2014 00:08:27 -0000 1.136
***************
*** 106,119 ****
# variables
#------------------------------------------------------------------------------
- ASTYLE = astyle \
- --mode=c \
- --lineend=linux \
- --indent=spaces=4 \
- --style=ansi \
- --break-blocks \
- --pad-oper --pad-paren-in --pad-header --unpad-paren \
- --align-pointer=name \
- --suffix=none
-
TARGET = z80asm$(EXESUFFIX)
MSVC_TARGET = ../../win32/Debug/$(TARGET)
--- 106,109 ----
***************
*** 129,132 ****
--- 119,123 ----
legacy:
echo "#define __LEGACY_Z80ASM_SYNTAX " > legacy.h
+ $(MAKE) -f dev\Makefile
$(MAKE) depend
$(MAKE)
***************
*** 134,137 ****
--- 125,129 ----
new:
echo "#undef __LEGACY_Z80ASM_SYNTAX " > legacy.h
+ $(MAKE) -f dev\Makefile
$(MAKE) depend
$(MAKE)
***************
*** 158,162 ****
#------------------------------------------------------------------------------
clean :
! $(RM) *.o $(LOCAL_LIB)/*.o *.exe $(LOCAL_LIB)/*.exe *~ $(LOCAL_LIB)/*~
$(RM) *.bak $(LOCAL_LIB)/*.bak *.orig $(LOCAL_LIB)/*.orig core $(LOCAL_LIB)/core
$(RM) $(TARGET) $(LOCAL_LIB)/$(TARGET) test* $(LOCAL_LIB)/test*
--- 150,154 ----
#------------------------------------------------------------------------------
clean :
! $(RM) *.o $(LOCAL_LIB)/*.o *.exe $(LOCAL_LIB)/*.exe *~ $(LOCAL_LIB)/*~ *.tmp
$(RM) *.bak $(LOCAL_LIB)/*.bak *.orig $(LOCAL_LIB)/*.orig core $(LOCAL_LIB)/core
$(RM) $(TARGET) $(LOCAL_LIB)/$(TARGET) test* $(LOCAL_LIB)/test*
***************
*** 192,201 ****

#------------------------------------------------------------------------------
- # formatting style
- #------------------------------------------------------------------------------
- astyle:
- $(ASTYLE) *.c *.h $(LOCAL_LIB)/*.c $(LOCAL_LIB)/*.h
-
- #------------------------------------------------------------------------------
# gccmake.bat - work arround impossibility of writing a '$' in the perl code
#------------------------------------------------------------------------------
--- 184,187 ----
***************
*** 246,249 ****
--- 232,239 ----
#------------------------------------------------------------------------------
# $Log$
+ # Revision 1.136 2014/03/29 00:08:27 pauloscustodio
+ # Moved astyle to dev/Makefile
+ # Added code to generate scan_rules.h from scan_rules.rl by calling preprocessor and ragel.
+ #
# Revision 1.135 2014/03/11 22:59:20 pauloscustodio
# Move EOL flag to scanner
***************
*** 835,841 ****
ldinstr.o: lib/xmalloc.h codearea.h lib/types.h config.h errors.h
ldinstr.o: errors_def.h options.h lib/list.h lib/class.h lib/queue.h
! ldinstr.o: options_def.h scan.h symbol.h model.h objfile.h symtab.h
! ldinstr.o: lib/classhash.h lib/strhash.h lib/uthash.h lib/die.h sym.h
! ldinstr.o: symref.h lib/classlist.h token.h token_def.h legacy.h z80asm.h
listfile.o: lib/xmalloc.h listfile.h lib/class.h lib/queue.h lib/types.h
listfile.o: lib/strutil.h symref.h lib/classlist.h lib/fileutil.h lib/list.h
--- 825,831 ----
ldinstr.o: lib/xmalloc.h codearea.h lib/types.h config.h errors.h
ldinstr.o: errors_def.h options.h lib/list.h lib/class.h lib/queue.h
! ldinstr.o: options_def.h scan.h token.h token_def.h legacy.h symbol.h model.h
! ldinstr.o: objfile.h symtab.h lib/classhash.h lib/strhash.h lib/uthash.h
! ldinstr.o: lib/die.h sym.h symref.h lib/classlist.h z80asm.h
listfile.o: lib/xmalloc.h listfile.h lib/class.h lib/queue.h lib/types.h
listfile.o: lib/strutil.h symref.h lib/classlist.h lib/fileutil.h lib/list.h
***************
*** 853,862 ****
model.o: lib/srcfile.h
modlink.o: lib/xmalloc.h codearea.h lib/types.h config.h errors.h
! modlink.o: errors_def.h expr.h lib/array.h lib/class.h lib/queue.h
! modlink.o: lib/strutil.h symbol.h model.h lib/list.h objfile.h symtab.h
! modlink.o: lib/classhash.h lib/strhash.h lib/uthash.h lib/die.h sym.h
! modlink.o: symref.h lib/classlist.h token.h token_def.h legacy.h expr_def.h
modlink.o: lib/fileutil.h listfile.h options.h options_def.h scan.h
! modlink.o: lib/strpool.h lib/except.h z80asm.h
module.o: lib/xmalloc.h module.h lib/class.h lib/queue.h lib/types.h
module.o: lib/classlist.h lib/strutil.h symtab.h lib/classhash.h
--- 843,852 ----
model.o: lib/srcfile.h
modlink.o: lib/xmalloc.h codearea.h lib/types.h config.h errors.h
! modlink.o: errors_def.h lib/except.h lib/die.h expr.h lib/array.h lib/class.h
! modlink.o: lib/queue.h lib/strutil.h symbol.h model.h lib/list.h objfile.h
! modlink.o: symtab.h lib/classhash.h lib/strhash.h lib/uthash.h sym.h symref.h
! modlink.o: lib/classlist.h token.h token_def.h legacy.h expr_def.h
modlink.o: lib/fileutil.h listfile.h options.h options_def.h scan.h
! modlink.o: lib/strpool.h z80asm.h
module.o: lib/xmalloc.h module.h lib/class.h lib/queue.h lib/types.h
module.o: lib/classlist.h lib/strutil.h symtab.h lib/classhash.h
***************
*** 873,887 ****
prsident.o: errors.h errors_def.h listfile.h lib/class.h lib/queue.h
prsident.o: lib/strutil.h symref.h lib/classlist.h options.h lib/list.h
! prsident.o: options_def.h scan.h symbol.h model.h objfile.h symtab.h
! prsident.o: lib/classhash.h lib/strhash.h lib/uthash.h lib/die.h sym.h
! prsident.o: token.h token_def.h legacy.h z80asm.h
prsline.o: lib/xmalloc.h codearea.h lib/types.h config.h errors.h
! prsline.o: errors_def.h lib/init.h lib/die.h lib/list.h lib/class.h
! prsline.o: lib/queue.h listfile.h lib/strutil.h symref.h lib/classlist.h
! prsline.o: options.h options_def.h scan.h symbol.h model.h objfile.h symtab.h
! prsline.o: lib/classhash.h lib/strhash.h lib/uthash.h sym.h token.h
! prsline.o: token_def.h legacy.h z80asm.h
! scan.o: lib/xmalloc.h errors.h errors_def.h scan.h lib/types.h lib/strutil.h
! scan.o: lib/class.h lib/queue.h
sym.o: lib/xmalloc.h listfile.h lib/class.h lib/queue.h lib/types.h
sym.o: lib/strutil.h symref.h lib/classlist.h options.h lib/list.h
--- 863,878 ----
prsident.o: errors.h errors_def.h listfile.h lib/class.h lib/queue.h
prsident.o: lib/strutil.h symref.h lib/classlist.h options.h lib/list.h
! prsident.o: options_def.h scan.h token.h token_def.h legacy.h symbol.h
! prsident.o: model.h objfile.h symtab.h lib/classhash.h lib/strhash.h
! prsident.o: lib/uthash.h lib/die.h sym.h z80asm.h
prsline.o: lib/xmalloc.h codearea.h lib/types.h config.h errors.h
! prsline.o: errors_def.h listfile.h lib/class.h lib/queue.h lib/strutil.h
! prsline.o: symref.h lib/classlist.h options.h lib/list.h options_def.h scan.h
! prsline.o: token.h token_def.h legacy.h symbol.h model.h objfile.h symtab.h
! prsline.o: lib/classhash.h lib/strhash.h lib/uthash.h lib/die.h sym.h
! prsline.o: z80asm.h
! scan.o: lib/xmalloc.h errors.h errors_def.h lib/init.h lib/types.h lib/die.h
! scan.o: lib/list.h lib/class.h lib/queue.h model.h scan.h token.h token_def.h
! scan.o: legacy.h lib/strutil.h scan_rules.h
sym.o: lib/xmalloc.h listfile.h lib/class.h lib/queue.h lib/types.h
sym.o: lib/strutil.h symref.h lib/classlist.h options.h lib/list.h
***************
*** 899,908 ****
token.o: lib/die.h
z80asm.o: lib/xmalloc.h codearea.h lib/types.h config.h deffile.h
! z80asm.o: errors.h errors_def.h expr.h lib/array.h lib/class.h lib/queue.h
! z80asm.o: lib/strutil.h symbol.h model.h lib/list.h objfile.h symtab.h
! z80asm.o: lib/classhash.h lib/strhash.h lib/uthash.h lib/die.h sym.h symref.h
! z80asm.o: lib/classlist.h token.h token_def.h legacy.h expr_def.h
z80asm.o: lib/fileutil.h hist.h listfile.h mapfile.h options.h options_def.h
! z80asm.o: scan.h lib/strpool.h lib/except.h z80asm.h
z80instr.o: lib/xmalloc.h codearea.h lib/types.h config.h
z80instr.o: errors.h errors_def.h expr.h lib/array.h lib/class.h lib/queue.h
--- 890,899 ----
token.o: lib/die.h
z80asm.o: lib/xmalloc.h codearea.h lib/types.h config.h deffile.h
! z80asm.o: errors.h errors_def.h lib/except.h lib/die.h expr.h lib/array.h
! z80asm.o: lib/class.h lib/queue.h lib/strutil.h symbol.h model.h lib/list.h
! z80asm.o: objfile.h symtab.h lib/classhash.h lib/strhash.h lib/uthash.h sym.h
! z80asm.o: symref.h lib/classlist.h token.h token_def.h legacy.h expr_def.h
z80asm.o: lib/fileutil.h hist.h listfile.h mapfile.h options.h options_def.h
! z80asm.o: scan.h lib/strpool.h z80asm.h
z80instr.o: lib/xmalloc.h codearea.h lib/types.h config.h
z80instr.o: errors.h errors_def.h expr.h lib/array.h lib/class.h lib/queue.h
***************
*** 917,921 ****
z80pass.o: symref.h lib/classlist.h token.h token_def.h legacy.h expr_def.h
z80pass.o: lib/fileutil.h hist.h listfile.h options.h options_def.h scan.h
! z80pass.o: z80asm.h
lib/class.o: lib/xmalloc.h lib/class.h lib/queue.h lib/types.h lib/die.h
lib/class.o: lib/init.h
--- 908,912 ----
z80pass.o: symref.h lib/classlist.h token.h token_def.h legacy.h expr_def.h
z80pass.o: lib/fileutil.h hist.h listfile.h options.h options_def.h scan.h
! z80pass.o: lib/srcfile.h z80asm.h
lib/class.o: lib/xmalloc.h lib/class.h lib/queue.h lib/types.h lib/die.h
lib/class.o: lib/init.h


------------------------------------------------------------------------------
Post Reply