[svn:parrot] r35419 - trunk/config/gen/makefiles

Author: fperrad
Date: Sun Jan 11 08:06:27 2009
New Revision: 35419

Modified:
   trunk/config/gen/makefiles/json.in
   trunk/config/gen/makefiles/nqp.in
   trunk/config/gen/makefiles/pct.in
   trunk/config/gen/makefiles/pirc.in
   trunk/config/gen/makefiles/tge.in

Log:
[makefile]
- clean up & layout

Modified: trunk/config/gen/makefiles/json.in
==============================================================================
--- trunk/config/gen/makefiles/json.in	(original)
+++ trunk/config/gen/makefiles/json.in	Sun Jan 11 08:06:27 2009
@@ -33,7 +33,7 @@
 	cd $(TOOL_DIR) && prove -r t/compilers/json
 
 testclean:
-	$(RM_F) "../../t/compilers/json/*.pir" \
+	$(RM_F) "../../t/compilers/json/*.pir"
 
 JSON.pbc : JSON/grammar.pbc JSON/pge2pir.pbc JSON.pir
 	$(PARROT) --output=JSON.pbc JSON.pir
@@ -51,4 +51,4 @@
 	$(PARROT) $(TGE_DIR)/tgc.pir --output=JSON/pge2pir.pir JSON/pge2pir.tg
 
 clean : testclean
-	@rm_f@ "JSON/*.pbc" "JSON/*.pir" JSON.pbc
+	$(RM_F) "JSON/*.pbc" "JSON/*.pir" JSON.pbc

Modified: trunk/config/gen/makefiles/nqp.in
==============================================================================
--- trunk/config/gen/makefiles/nqp.in	(original)
+++ trunk/config/gen/makefiles/nqp.in	Sun Jan 11 08:06:27 2009
@@ -10,13 +10,15 @@
 
 all: nqp.pbc
 
-SOURCES = nqp.pir \
+SOURCES = \
+  nqp.pir \
   src/Grammar.pg \
   src/Grammar/Actions.pir \
   src/builtins.pir
 
-BOOTSRC = bootstrap/nqp.pir \
-	bootstrap/actions.pm
+BOOTSRC = \
+  bootstrap/nqp.pir \
+  bootstrap/actions.pm
 
 # the default target
 nqp.pbc: $(PARROT) $(PGE_LIBRARY)/Perl6Grammar.pir $(SOURCES)
@@ -26,9 +28,9 @@
 
 boot: $(BOOTSRC)
 	$(PARROT) nqp.pbc \
-	--output=bootstrap/gen_actions.pir \
-	--target=pir \
-	bootstrap/actions.pm
+	    --output=bootstrap/gen_actions.pir \
+	    --target=pir \
+	    bootstrap/actions.pm
 	$(PARROT) --output-pbc -o bootstrap/nqp.pbc bootstrap/nqp.pir
 
 # This is a listing of all targets, that are meant to be called by users

Modified: trunk/config/gen/makefiles/pct.in
==============================================================================
--- trunk/config/gen/makefiles/pct.in	(original)
+++ trunk/config/gen/makefiles/pct.in	Sun Jan 11 08:06:27 2009
@@ -1,14 +1,14 @@
 # $Id$
 
 # Setup some commands
-LN_S     = @lns@
 PERL     = @perl@
 RM_F     = @rm_f@
+CP       = @cp@
 PARROT   = ../../parrot@exe@
+
 TOOL_DIR = ../..
 PGE_DIR  = ../../compilers/pge
 TEST_DIR = ../../t/compilers/pct
-CP       = @cp@
 
 # Where to put things
 PARROT_LIBRARY    = ../../runtime/parrot/library
@@ -58,7 +58,7 @@
 	@echo "  help:              Print this help message."
 	@echo ""
 
-test: all 
+test: all
 	cd $(TOOL_DIR) && prove -r t/compilers/pct
 
 testclean:

Modified: trunk/config/gen/makefiles/pirc.in
==============================================================================
--- trunk/config/gen/makefiles/pirc.in	(original)
+++ trunk/config/gen/makefiles/pirc.in	Sun Jan 11 08:06:27 2009
@@ -1,7 +1,8 @@
 # $Id$
 
+.SUFFIXES : .c @o@
+
 # Setup some commands
-LN_S          = @lns@
 PERL          = @perl@
 RM_F          = @rm_f@
 PARROT        = ../../parrot@exe@
@@ -26,37 +27,38 @@
 LD            = @ld@
 LDFLAGS       = @ldflags@ @ld_debug@
 
-SOURCES       = src/main.c \
-src/pirparser.c \
-src/pirlexer.c \
-src/pircompunit.c \
-src/pircompiler.c \
-src/pirsymbol.c \
-src/piremit.c \
-src/hdocprep.c \
-src/pirmacro.c \
-src/pirregalloc.c \
-src/bcgen.c \
-src/pirerr.c \
-src/pircapi.c \
-src/pirop.c
+SOURCES       = \
+  src/main.c \
+  src/pirparser.c \
+  src/pirlexer.c \
+  src/pircompunit.c \
+  src/pircompiler.c \
+  src/pirsymbol.c \
+  src/piremit.c \
+  src/hdocprep.c \
+  src/pirmacro.c \
+  src/pirregalloc.c \
+  src/bcgen.c \
+  src/pirerr.c \
+  src/pircapi.c \
+  src/pirop.c
 
 OBJS          = \
-src/main$(O) \
-src/pirparser$(O) \
-src/pirlexer$(O) \
-src/pircompunit$(O) \
-src/pircompiler$(O) \
-src/pirsymbol$(O) \
-src/piremit$(O) \
-src/hdocprep$(O) \
-src/pirmacro$(O) \
-src/pirregalloc$(O) \
-src/bcgen$(O) \
-src/pirpcc$(O) \
-src/pirerr$(O) \
-src/pircapi$(O) \
-src/pirop$(O)
+  src/main$(O) \
+  src/pirparser$(O) \
+  src/pirlexer$(O) \
+  src/pircompunit$(O) \
+  src/pircompiler$(O) \
+  src/pirsymbol$(O) \
+  src/piremit$(O) \
+  src/hdocprep$(O) \
+  src/pirmacro$(O) \
+  src/pirregalloc$(O) \
+  src/bcgen$(O) \
+  src/pirpcc$(O) \
+  src/pirerr$(O) \
+  src/pircapi$(O) \
+  src/pirop$(O)
 
 .c$(O) :
 	@$(PERL) ../../tools/dev/cc_flags.pl -v ../../CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
@@ -68,8 +70,8 @@
 
 pirc$(EXE): $(OBJS)
 	$(LINK) @ld_out@$@ \
-  $(OBJS) \
-	@rpath_blib@ @libparrot_ldflags@ $(C_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC)
+	    $(OBJS) \
+	    @rpath_blib@ @libparrot_ldflags@ $(C_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC)
 
 src/pirparser$(O): src/pirparser.c src/pirparser.h
 src/pirlexer$(O): src/pirlexer.c src/pirlexer.h
@@ -98,12 +100,11 @@
 clean:
 	$(RM_F) *$(O)
 	$(RM_F) $(OBJS)
-	$(RM_F) pirc
+	$(RM_F) pirc$(EXE)
 
 realclean: clean
 	$(RM_F) \
-Makefile \
-pirc$(EXE) \
-doc/*.html
+	    Makefile \
+	    doc/*.html
 
 distclean: realclean

Modified: trunk/config/gen/makefiles/tge.in
==============================================================================
--- trunk/config/gen/makefiles/tge.in	(original)
+++ trunk/config/gen/makefiles/tge.in	Sun Jan 11 08:06:27 2009
@@ -51,12 +51,12 @@
 
 clean: testclean
 	$(RM_F) TGE/Rule.pbc \
-	TGE/Parser.pir \
-	TGE/Parser.pbc \
-	TGE/Tree.pbc \
-	TGE/Grammar.pbc \
-	TGE/Compiler.pbc \
-	$(PARROT_LIBRARY)/TGE.pbc
+	    TGE/Parser.pir \
+	    TGE/Parser.pbc \
+	    TGE/Tree.pbc \
+	    TGE/Grammar.pbc \
+	    TGE/Compiler.pbc \
+	    $(PARROT_LIBRARY)/TGE.pbc
 
 realclean: clean
 	$(RM_F) Makefile

• [svn:parrot] r35419 - trunk/config/gen/makefiles by fperrad