cvsuser 05/03/15 13:41:42
Modified: config/gen/makefiles root.in
Log:
Clean up shared libraries in 'runtime/parrot/dynext'.
Added new target 'dynext-clean', upon which 'realclean' depends.
Rename LIBNCI_SO to LIBNCI_TEST_SO.
Revision Changes Path
1.283 +24 -16 parrot/config/gen/makefiles/root.in
Index: root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- root.in 14 Mar 2005 13:20:51 -0000 1.282
+++ root.in 15 Mar 2005 21:41:42 -0000 1.283
@@ -1,5 +1,5 @@
# Copyright: 2001-2005 The Perl Foundation. All Rights Reserved.
-# $Id: root.in,v 1.282 2005/03/14 13:20:51 leo Exp $
+# $Id: root.in,v 1.283 2005/03/15 21:41:42 bernhard Exp $
###############################################################################
#
@@ -444,7 +444,7 @@
# dynamic extensions
DYNEXT_DIR = runtime/parrot/dynext
-LIBNCI_SO = $(DYNEXT_DIR)/libnci_test$(LOAD_EXT)
+LIBNCI_TEST_SO = $(DYNEXT_DIR)/libnci_test$(LOAD_EXT)
###############################################################################
#
@@ -488,7 +488,7 @@
#
###############################################################################
-all : flags_dummy $(PARROT) runtime/parrot/include/parrotlib.pbc
runtime/parrot/include/config.fpmc docs $(LIBNCI_SO) $(GEN_LIBRARY) dynclasses
+all : flags_dummy $(PARROT) runtime/parrot/include/parrotlib.pbc
runtime/parrot/include/config.fpmc docs $(LIBNCI_TEST_SO) $(GEN_LIBRARY)
dynclasses
# constant string support
.c.str :
@@ -1217,7 +1217,8 @@
###############################################################################
clean : test-clean \
- progclean \
+ prog-clean \
+ dynext-clean \
languages-clean \
docs-clean \
dynclasses-clean \
@@ -1230,20 +1231,26 @@
examples/assembly/mops$(O) examples/assembly/mops.pbc \
examples/mops/mops$(O) examples/mops/mops$(EXE)
-progclean :
- $(RM_F) $(O_FILES) \
- $(PARROT) $(IMCC_DIR)/main$(O) \
- $(PDUMP) $(SRC_DIR)/pdump$(O) $(SRC_DIR)/packdump$(O) \
- $(SRC_DIR)/pbc_info$(O) $(PINFO) \
- $(PDB) $(SRC_DIR)/pdb$(O) \
- $(DIS) $(SRC_DIR)/disassemble$(O) \
- $(LIBNCI_SO)
- $(RM_F) $(LIBPARROT)
+prog-clean :
+ $(RM_F) \
+ $(O_FILES) \
+ $(PARROT) $(IMCC_DIR)/main$(O) \
+ $(PDUMP) $(SRC_DIR)/pdump$(O) $(SRC_DIR)/packdump$(O) \
+ $(SRC_DIR)/pbc_info$(O) $(PINFO) \
+ $(PDB) $(SRC_DIR)/pdb$(O) \
+ $(DIS) $(SRC_DIR)/disassemble$(O) \
+ $(LIBNCI_TEST_SO) \
+ $(LIBPARROT)
$(PERL) build_tools/c2str.pl --init
$(RM_F) $(STR_FILES) $(INC_DIR)/string_private_cstring.h
$(RM_F) classes/*.c classes/*.h classes/*.dump vtable.dump
-# win32 import library (shared object is deleted by LIBNCI_SO above)
- $(RM_F) $(DYNEXT_DIR)/libnci_test.lib
+
+dynext-clean :
+# shared libs
+ $(RM_F) $(DYNEXT_DIR)/*$(LOAD_EXT)
+ $(RM_F) $(DYNEXT_DIR)/*$(SHARE_EXT)
+# win32 import library (shared object is deleted by LIBNCI_TEST_SO above)
+ $(RM_F) $(DYNEXT_DIR)/*.lib
# win32 program data base - contains debugging info
$(RM_F) *.pdb $(DYNEXT_DIR)/*.pdb
# win32 incremental link status files
@@ -1251,6 +1258,7 @@
# win32 exported functions and data items
$(RM_F) $(DYNEXT_DIR)/*.exp
+
# Remove files generated by the test suite
test-clean : test_imcc-clean
$(RM_F) t/benchmarks*.imc
@@ -1395,7 +1403,7 @@
###### OS depend targets ##########
# for use by t/pmc/nci.t
-$(LIBNCI_SO): $(SRC_DIR)/nci_test$(O)
+$(LIBNCI_TEST_SO): $(SRC_DIR)/nci_test$(O)
$(LD) $(LD_LOAD_FLAGS) ${ncilib_link_extra} $(LDFLAGS) \
$(LD_OUT)$@ $(SRC_DIR)/nci_test$(O) $(C_LIBS)
