[svn:parrot] r34738 - trunk/languages/pipp/config/makefiles

Author: bernhard
Date: Thu Jan  1 06:00:01 2009
New Revision: 34738

Modified:
   trunk/languages/pipp/config/makefiles/root.in

Log:
[Pipp] Replace HASH_DIR with PMC_DIR
Replace PIPP_DIR with BUILD_DIR/languages/pipp


Modified: trunk/languages/pipp/config/makefiles/root.in
==============================================================================
--- trunk/languages/pipp/config/makefiles/root.in	(original)
+++ trunk/languages/pipp/config/makefiles/root.in	Thu Jan  1 06:00:01 2009
@@ -10,8 +10,6 @@
 LIBRARY_DIR   = $(BUILD_DIR)/runtime/parrot/library
 INCLUDE_DIR   = $(BUILD_DIR)/include
 PMC_DIR       = src/pmc
-PIPP_DIR      = $(BUILD_DIR)/languages/pipp
-HASH_DIR      = $(PIPP_DIR)/src/pmc
 PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
 
 # Set up commands
@@ -48,9 +46,9 @@
   $(PMC_DIR)/phpstring.pmc \
   $(PMC_DIR)/phpnull.pmc
 
-HASH_SOURCES = $(HASH_DIR)/pipp_hash.c
-HASH_H       = $(HASH_DIR)/pipp_hash.h
-HASH_OBJS    = $(HASH_DIR)/pipp_hash$(O)
+HASH_SOURCES = $(PMC_DIR)/pipp_hash.c
+HASH_H       = $(PMC_DIR)/pipp_hash.h
+HASH_OBJS    = $(PMC_DIR)/pipp_hash$(O)
 
 PHP_GROUP = $(PMC_DIR)/php_group$(LOAD_EXT)
 
@@ -207,8 +205,8 @@
 	$(TOUCH) $(PMC_DIR)/phparray.pmc
 	$(CC) $(CFLAGS) -I$(INCLUDE_DIR) $(HASH_SOURCES) -c -g -o $(HASH_OBJS)
 
-export DYNPMC_INCLUDE=$(PIPP_DIR)
-export DYNPMC_LINK=$(HASH_OBJS)
+export DYNPMC_INCLUDE=$(BUILD_DIR)/languages/pipp
+export DYNPMC_LINK=$(BUILD_DIR)/languages/pipp/$(HASH_OBJS)
 
 $(PHP_GROUP): $(PMC_SOURCES)
 	@cd $(PMC_DIR) && $(PMCBUILD) generate $(PMCS)

• [svn:parrot] r34738 - trunk/languages/pipp/config/makefiles by bernhard