Put library *.pmc files into library.

Courtesy of François Perrad
bschmalhofer · Feb 20, 2009 · 24fb6a1 · 24fb6a1
1 parent 1eb8293
commit 24fb6a1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 /Makefile
-/*.pbc
 
+/pipp.pbc
 /pipp
 /pipp.c
 /pipp.o
@@ -10,6 +10,8 @@
 
 *.patch
 
+/library/*.pbc
+
 /src/pct/gen_*.pir
 
 /src/pmc/php*.c

diff --git a/config/makefiles/root.in b/config/makefiles/root.in
@@ -111,9 +111,9 @@ PHP_SRC_STD_EXT = \
   src/common/php_versioning.pir
 
 PHP_EXT = \
-  php_ctype.pbc \
-  php_gmp.pbc \
-  php_pcre.pbc
+  library/php_ctype.pbc \
+  library/php_gmp.pbc \
+  library/php_pcre.pbc
 
 # default
 all: build
@@ -154,14 +154,14 @@ Makefile: config/makefiles/root.in
 
 build:           build-common
 
-#build-common:    build-pmc pipplib.pbc pipp.pbc $(PHP_EXT) Test.pir
-build-common:    build-pmc pipplib.pbc pipp.pbc $(PHP_EXT)
+#build-common:    build-pmc library/pipplib.pbc pipp.pbc $(PHP_EXT) Test.pir
+build-common:    build-pmc library/pipplib.pbc pipp.pbc $(PHP_EXT)
 
 # Target for building a standalone Pipp.
 pipp$(EXE): build-common
 	$(PBC_TO_EXE) pipp.pbc
 
-pipplib.pbc: \
+library/pipplib.pbc: \
   src/common/builtins.pir \
   src/common/guts.pir \
   src/common/eval.pir \
@@ -170,16 +170,16 @@ pipplib.pbc: \
   $(PHP_SRC_STD_EXT) \
   src/common/php_API.pir \
   src/common/php_MACRO.pir
-	$(PARROT) -o pipplib.pbc src/common/builtins.pir
+	$(PARROT) -o library/pipplib.pbc src/common/builtins.pir
 
-php_ctype.pbc: src/common/php_ctype.pir src/common/php_MACRO.pir
-	$(PARROT) -o php_ctype.pbc src/common/php_ctype.pir
+library/php_ctype.pbc: src/common/php_ctype.pir src/common/php_MACRO.pir
+	$(PARROT) -o library/php_ctype.pbc src/common/php_ctype.pir
 
-php_gmp.pbc: src/common/php_gmp.pir src/common/php_MACRO.pir
-	$(PARROT) -o php_gmp.pbc src/common/php_gmp.pir
+library/php_gmp.pbc: src/common/php_gmp.pir src/common/php_MACRO.pir
+	$(PARROT) -o library/php_gmp.pbc src/common/php_gmp.pir
 
-php_pcre.pbc: src/common/php_pcre.pir src/common/php_MACRO.pir
-	$(PARROT) -o php_pcre.pbc src/common/php_pcre.pir
+library/php_pcre.pbc: src/common/php_pcre.pir src/common/php_MACRO.pir
+	$(PARROT) -o library/php_pcre.pbc src/common/php_pcre.pir
 
 src/pct/gen_grammar.pir: $(LIBRARY_DIR)/PGE/Perl6Grammar.pir src/pct/grammar.pg
 	$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pir \
@@ -328,9 +328,10 @@ codetest-pod:
 # cleaning up
 clean: clean-pmc clean-test clean-hash
 	$(RM_F) \
+  library/*.pbc \
   src/pct/gen_grammar.pir \
   src/pct/gen_actions.pir \
-  *.pbc \
+  pipp.pbc \
   pipp.c \
   pipp.$(O) \
   pipp$(EXE)

diff --git a/pipp.pir b/pipp.pir
@@ -85,7 +85,7 @@ Bernhard Schmalhofer - L<Bernhard.Schmalhofer@gmx.de>
     cfg  = $P0()
     .local string lib_dir, pbc_fn
     lib_dir = cfg['build_dir']
-    lib_dir .= '/languages/pipp'
+    lib_dir .= '/languages/pipp/library'
 
     pbc_fn = concat lib_dir, '/pipplib.pbc'
     load_bytecode pbc_fn