Some tidbits in Makefiles

bschmalhofer · Mar 21, 2009 · d7ee4a0 · d7ee4a0
1 parent 3b93228
commit d7ee4a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/build/templates/Makefile.in b/build/templates/Makefile.in
@@ -1,7 +1,6 @@
-## arguments we want to run parrot with
-PARROT_ARGS   :=
+# Makefile for pipp
 
-## configuration settings
+# configuration settings
 VERSION_DIR   := @versiondir@
 BIN_DIR       := @bin_dir@
 LIB_DIR       := @lib_dir@$(VERSION_DIR)
@@ -31,7 +30,7 @@ NQP           := $(BUILD_DIR)/compilers/nqp/nqp.pbc
 PCT           := $(BUILD_DIR)/runtime/parrot/library/PCT.pbc
 PBC_TO_EXE    := $(BUILD_DIR)/pbc_to_exe$(EXE)
 
-PIPP_GROUP    := $(DYNEXT_DIR)/pipp_group$(LOAD_EXT)
+PMC_GROUP     := $(DYNEXT_DIR)/pipp_group$(LOAD_EXT)
 
 PMC_DEPS      := \
   $(PMC_DIR)/php.pmc \
@@ -116,9 +115,8 @@ help:
 	@echo "Following targets are available for the user:"
 	@echo ""
 	@echo "Building:"
-	@echo "  all:               Build pipp.pbc"
+	@echo "  all:               Build pipp$(EXE)"
 	@echo "                     This is the default."
-	@echo "  pipp$(EXE):        A fancy executable."
 	@echo ""
 	@echo "Testing:"
 	@echo "  test:              Run the test suite for Pipp."
@@ -146,9 +144,9 @@ Makefile: build/templates/Makefile.in
 pipp$(EXE): pipp.pbc
 	$(PBC_TO_EXE) pipp.pbc
 
-pipp.pbc: $(PIPP_GROUP) $(PIPP_LIBS)
+pipp.pbc: $(PMC_GROUP) $(PIPP_LIBS)
 
-$(PIPP_GROUP): $(PMC_DEPS) 
+$(PMC_GROUP): $(PMC_DEPS) 
 	$(MAKE) $(PMC_DIR) build
 
 pipp_library/pipplib.pbc: \
@@ -225,13 +223,10 @@ test-php:
 	- $(PERL) t/harness --with-php
 
 # run the test suite, create a TAP archive and send it off to smolder
-smolder_test : smoke
-smoke : all
+smoke: all
 	- $(PERL) t/harness --archive --send-to-smolder
 
 
-# make sure debugging output is disabled while running the tests
-export PMCDEBUG=
 
 # this does not work yet
 test-pcc-testsuite: all t/pcc-testsuite

diff --git a/build/templates/src/pmc/Makefile.in b/build/templates/src/pmc/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_DIR   := $(LIB_DIR)/dynext
 LOAD_EXT      := @load_ext@
 O             := @o@
 
-PIPP_GROUP    := $(DYNEXT_DIR)/pipp_group$(LOAD_EXT)
+PMC_GROUP    := $(DYNEXT_DIR)/pipp_group$(LOAD_EXT)
 
 PMCS          := \
   php \
@@ -44,7 +44,7 @@ PMC_SOURCES := \
 
 
 # default
-build: $(PIPP_GROUP)
+build: $(PMC_GROUP)
 
 
 # This is a listing of all targets, that are meant to be called by users
@@ -60,7 +60,7 @@ help:
 	@echo "  clean:             Clean up."
 	@echo ""
 
-$(PIPP_GROUP): $(PMC_SOURCES)
+$(PMC_GROUP): $(PMC_SOURCES)
 	$(PMCBUILD) generate $(PMCS)
 	$(PMCBUILD) compile $(PMCS)
 	$(PMCBUILD) linklibs $(PMCS)