[svn:mod_parrot] r554 - mod_parrot/trunk

Author: jhorwitz
Date: Mon Dec 29 13:12:32 2008
New Revision: 554

Modified:
   mod_parrot/trunk/Makefile.in

Log:
refactor PIR compilation rules


Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in	(original)
+++ mod_parrot/trunk/Makefile.in	Mon Dec 29 13:12:32 2008
@@ -41,22 +41,22 @@
         $(SRC_DIR)/modparrot_io.lo \
 	$(SRC_DIR)/module.lo
 
-MPLIBS=	lib/ModParrot/Apache/RequestRec \
-	lib/ModParrot/Apache/Constants \
-	lib/ModParrot/Apache/Module \
-	lib/ModParrot/APR/Pool \
-	lib/ModParrot/APR/Table \
-	lib/mod_parrot \
-	lib/ModParrot/Constants \
-	lib/ModParrot/Context \
-	lib/ModParrot/Interpreter \
-	lib/ModParrot/HLL/pir \
-	lib/ModParrot/HLL/perl6 \
-	lib/ModParrot/HLL/pipp \
-	lib/ModParrot/HLL/lolcode \
-	lib/ModParrot/HLL/nqp
+MPLIBS=	lib/ModParrot/Apache/RequestRec.pbc \
+	lib/ModParrot/Apache/Constants.pbc \
+	lib/ModParrot/Apache/Module.pbc \
+	lib/ModParrot/APR/Pool.pbc \
+	lib/ModParrot/APR/Table.pbc \
+	lib/mod_parrot.pbc \
+	lib/ModParrot/Constants.pbc \
+	lib/ModParrot/Context.pbc \
+	lib/ModParrot/Interpreter.pbc \
+	lib/ModParrot/HLL/pir.pbc \
+	lib/ModParrot/HLL/perl6.pbc \
+	lib/ModParrot/HLL/pipp.pbc \
+	lib/ModParrot/HLL/lolcode.pbc \
+	lib/ModParrot/HLL/nqp.pbc
 
-all: gen-src $(SRC_DIR)/mod_parrot.la
+all: gen-src $(SRC_DIR)/mod_parrot.la libs
 
 %.lo: %.c
 	$(LIBTOOL) --mode=compile $(CC) -o $@ $(EXTRA_CPPFLAGS) $(DEBUG) $(CFLAGS) -I$(APACHE_INCLUDE_DIR) -I$(APR_INCLUDE_DIR) -I$(APU_INCLUDE_DIR) $(DEFINES) -c $<
@@ -68,13 +68,10 @@
 	rm -f $(SRC_DIR)/*.o $(SRC_DIR)/*.lo $(SRC_DIR)/*.slo $(SRC_DIR)/*.la core core.*
 	rm -rf $(SRC_DIR)/.libs
 
-libraries:
-	@echo Compiling libraries:
-	@for i in $(MPLIBS); \
-	do \
-		echo " $$i"; \
-		$(PARROT) -o $$i.pbc $$i.pir; \
-	done
+%.pbc: %.pir
+	$(PARROT) -o $@ $<
+
+libs: $(MPLIBS)
 
 modperl6: languages/perl6/lib/mod_perl6.pir languages/perl6/lib/ModPerl6/Registry.pir
 
@@ -94,17 +91,14 @@
 gen-src-clean:
 	rm -rf build/src
 
-libraries-clean:
-	for i in $(MPLIBS); \
-	do \
-		rm -f $$i.pbc; \
-	done
+libs-clean: 
+	rm -f $(MPLIBS)
 
 test-clean:
 	if [ -x t/TEST ]; then t/TEST -clean; fi
 	rm -f t/core.* t/lib/handlers.pbc t/TEST
 
-clean: files-clean libraries-clean gen-src-clean modperl6-clean
+clean: files-clean libs-clean gen-src-clean modperl6-clean
 
 distclean: clean test-clean
 	rm -f Makefile Makefile.old
@@ -112,6 +106,6 @@
 install: $(SRC_DIR)/mod_parrot.la
 	$(APXS) -i -n parrot -a $(SRC_DIR)/mod_parrot.la
 
-test: $(SRC_DIR)/mod_parrot.la libraries
+test: $(SRC_DIR)/mod_parrot.la libs
 	$(PARROT) -o t/lib/handlers.pbc t/lib/handlers.pir
 	$(PERL) t/TEST