Skip to content

Commit

Permalink
Fix Configure and the Makefile template and add a .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
leto committed Nov 19, 2009
1 parent 095b3ab commit c0579bc
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 86 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

*~
*.sw?
Makefile
8 changes: 4 additions & 4 deletions Configure.nqp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MAIN();

sub MAIN () {
# Wave to the friendly users
say("Hello, I'm Configure. My job is to poke and prod\nyour system to figure out how to build PL/Parrot.\n");
say("Hello, I'm Configure. My job is to poke and prod\nyour system to figure out how to build nqpTAP.\n");

# Load Parrot config and glue functions
pir::load_bytecode('PGE.pbc');
Expand All @@ -38,9 +38,9 @@ sub MAIN () {
# Give the user a hint of next action
my $make := %VM<config><make>;
say("Configure completed for platform '$OS'.");
say("You can now type '$make' to build PL/Parrot.\n");
say("You may also type '$make test' to run the PL/Parrot test suite.\n");
say("Happy Hacking,\n\tThe PL/Parrot Team");
say("You can now type '$make' to build nqpTAP.\n");
say("You may also type '$make test' to run the nqpTAP test suite.\n");
say("Happy Hacking,\n\tThe nqpTAP Team");
}

sub replacement ($match) {
Expand Down
72 changes: 0 additions & 72 deletions Makefile

This file was deleted.

20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PBC_TO_EXE = $(PARROT_BIN)/pbc_to_exe
PARROT_NQP = $(PARROT_BIN)/parrot-nqp

# The default target
all: plparrot$(EXE)
all: nqptap$(EXE)

# Always run the FORCEd targets, without checking the filesystem
.PHONY: FORCE
Expand All @@ -33,19 +33,19 @@ help: FORCE
@echo ""
@echo "The following targets are available:"
@echo ""
@echo " all: Generate plparrot executable (default target)"
@echo " all: Generate nqptap executable (default target)"
@echo " clean: Clean generated files"
@echo " test: Test plparrot and its libraries"
@echo " test: Test nqptap and its libraries"
@echo " help: Print this help message"
@echo ""

# The main build sequence
plparrot$(EXE): src/plparrot$(EXE)
$(CP) src/plparrot$(EXE) plparrot$(EXE)
$(CHMOD) 0755 plparrot$(EXE)
nqptap$(EXE): src/nqptap$(EXE)
$(CP) src/nqptap$(EXE) nqptap$(EXE)
$(CHMOD) 0755 nqptap$(EXE)

src/plparrot$(EXE): Makefile src/plparrot.pbc src/lib/Metadata.pbc src/lib/Util.pbc src/lib/Glue.pbc
$(PBC_TO_EXE) src/plparrot.pbc
src/nqptap$(EXE): Makefile src/nqptap.pbc src/lib/Metadata.pbc src/lib/Util.pbc src/lib/Glue.pbc
$(PBC_TO_EXE) src/nqptap.pbc

.SUFFIXES: .nqp .pir .pbc

Expand All @@ -60,8 +60,8 @@ realclean: clean

clean: FORCE
$(RM_F) "*~" "src/lib/*.pbc" "src/*.pbc" "src/*$(O)" "src/*.c" \
src/lib/Util.pir src/lib/Metadata.pir src/plparrot.pir \
src/plparrot$(EXE) plparrot$(EXE) Makefile
src/lib/Util.pir src/lib/Metadata.pir src/nqptap.pir \
src/nqptap$(EXE) nqptap$(EXE) Makefile

test: FORCE
$(PARROT_NQP) t/harness t/*.t
Expand Down

0 comments on commit c0579bc

Please sign in to comment.