[svn:parrot] r37073 - trunk/tools/dev
fperrad at svn.parrot.org
fperrad at svn.parrot.org
Mon Mar 2 10:56:18 UTC 2009
Author: fperrad
Date: Mon Mar 2 10:56:18 2009
New Revision: 37073
URL: https://trac.parrot.org/parrot/changeset/37073
Log:
[install] remove some build_dir, refactor some targets 'clean'
Modified:
trunk/tools/dev/mk_language_shell.pl
Modified: trunk/tools/dev/mk_language_shell.pl
==============================================================================
--- trunk/tools/dev/mk_language_shell.pl Mon Mar 2 10:50:05 2009 (r37072)
+++ trunk/tools/dev/mk_language_shell.pl Mon Mar 2 10:56:18 2009 (r37073)
@@ -387,11 +387,11 @@
INCLUDES := -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/pmc
LINKARGS := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT)
+ at uclang@_GROUP := @lclang at _group
+
PMC_SOURCES := \
@lclang at .pmc
- at uclang@_GROUP := @lclang at _group
-
OBJS := \
lib-$(@uclang at _GROUP)$(O) \
@lclang@$(O)
@@ -484,8 +484,8 @@
RM_RF := @rm_rf@
POD2MAN := pod2man
#IF(parrot_is_shared and not(cygwin or win32)):export LD_RUN_PATH := @blib_dir@:$(LD_RUN_PATH)
-PARROT := ../../parrot at exe@
-PBC_TO_EXE := ../../pbc_to_exe at exe@
+PARROT := $(BIN_DIR)/parrot at exe@
+PBC_TO_EXE := $(BIN_DIR)/pbc_to_exe at exe@
#IF(darwin):
#IF(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
#IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
@@ -507,6 +507,19 @@
DOCS := README
+BUILD_CLEANUPS := \
+ @lclang at .pbc \
+ "src/gen_*.pir" \
+ "*.c" \
+ "*$(O)" \
+ @lclang@@exe@ \
+#IF(win32): parrot- at lclang@.exe \
+#IF(win32): parrot- at lclang@.iss \
+#IF(win32): "setup-parrot-*.exe" \
+ installable_ at lclang@@exe@
+
+TEST_CLEANUPS :=
+
# the default target
build: \
$(@UCLANG at _OPS) \
@@ -527,7 +540,7 @@
src/parser/grammar.pg \
src/parser/grammar-oper.pg
-src/gen_actions.pir: $(NQP) $(PCT) src/parser/actions.pm
+src/gen_actions.pir: $(NQP) src/parser/actions.pm
$(PARROT) $(PARROT_ARGS) $(NQP) --output=src/gen_actions.pir \
--target=pir src/parser/actions.pm
@@ -545,7 +558,6 @@
installable_ at lclang@@exe@: @lclang at .pbc
$(PBC_TO_EXE) @lclang at .pbc --install
-# regenerate the Makefile
Makefile: config/makefiles/root.in
$(PERL) Configure.pl
@@ -578,7 +590,7 @@
test: build
$(PERL) t/harness
-# TODO: rename build_dir. basic run for missing libs
+# basic run for missing libs
test-installable: installable
echo "1" | ./installable_ at lclang@@exe@
@@ -611,29 +623,18 @@
$(PERL) $(LIB_DIR)/tools/dev/mk_inno_language.pl @lclang@
iscc parrot- at lclang@.iss
-# clean intermediate test files
testclean:
+ $(RM_F) $(TEST_CLEANUPS)
-CLEANUPS := \
- @lclang at .pbc \
- "src/gen_*.pir" \
- "*.c" \
- "*$(O)" \
- @lclang@@exe@ \
-#IF(win32): parrot- at lclang@.exe \
-#IF(win32): parrot- at lclang@.iss \
-#IF(win32): "setup-parrot-*.exe" \
- installable_ at lclang@@exe@
-
-clean: testclean
+clean:
@no_ops@ $(MAKE) $(OPS_DIR) clean
@no_pmc@ $(MAKE) $(PMC_DIR) clean
- $(RM_F) $(CLEANUPS)
+ $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS)
-realclean: testclean
+realclean:
@no_ops@ $(MAKE) $(OPS_DIR) realclean
@no_pmc@ $(MAKE) $(PMC_DIR) realclean
- $(RM_F) $(CLEANUPS) Makefile
+ $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS) Makefile
distclean: realclean
More information about the parrot-commits
mailing list