[svn:parrot] r46126 - in trunk: . config/gen config/gen/makefiles src/dynpmc tools/dev
darbelo at svn.parrot.org
darbelo at svn.parrot.org
Thu Apr 29 00:43:09 UTC 2010
Author: darbelo
Date: Thu Apr 29 00:43:09 2010
New Revision: 46126
URL: https://trac.parrot.org/parrot/changeset/46126
Log:
Merge include_dynpmc_makefile back to trunk, despite svn's efforts to prevent it.
Added:
trunk/src/dynpmc/Defines.in
- copied unchanged from r46123, branches/include_dynpmc_makefile/src/dynpmc/Defines.in
trunk/src/dynpmc/Rules.in
- copied unchanged from r46123, branches/include_dynpmc_makefile/src/dynpmc/Rules.in
Deleted:
trunk/config/gen/makefiles/dynpmc.in
Modified:
trunk/MANIFEST
trunk/config/gen/makefiles.pm
trunk/config/gen/makefiles/root.in
trunk/tools/dev/checkdepend.pl
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Thu Apr 29 00:41:04 2010 (r46125)
+++ trunk/MANIFEST Thu Apr 29 00:43:09 2010 (r46126)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Apr 26 12:41:21 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Thu Apr 29 00:39:52 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -245,7 +245,6 @@
config/gen/core_pmcs.pm []
config/gen/makefiles.pm []
config/gen/makefiles/docs.in []
-config/gen/makefiles/dynpmc.in []
config/gen/makefiles/editor.in []
config/gen/makefiles/ext.in []
config/gen/makefiles/parrot_embed_pl.in []
@@ -1233,7 +1232,9 @@
src/dynoplibs/Rules.in []
src/dynoplibs/math.ops []
src/dynoplibs/obscure.ops []
+src/dynpmc/Defines.in []
src/dynpmc/README.pod []doc
+src/dynpmc/Rules.in []
src/dynpmc/dynlexpad.pmc []
src/dynpmc/ext.pir []
src/dynpmc/foo.pmc []
Modified: trunk/config/gen/makefiles.pm
==============================================================================
--- trunk/config/gen/makefiles.pm Thu Apr 29 00:41:04 2010 (r46125)
+++ trunk/config/gen/makefiles.pm Thu Apr 29 00:43:09 2010 (r46126)
@@ -48,8 +48,12 @@
conditioned_lines => 1,
},
- 'src/dynpmc/Makefile' =>
- { SOURCE => 'config/gen/makefiles/dynpmc.in' },
+ 'src/dynpmc/Rules.mak' => {
+ SOURCE => 'src/dynpmc/Rules.in',
+ },
+ 'src/dynpmc/Defines.mak' => {
+ SOURCE => 'src/dynpmc/Defines.in',
+ },
'editor/Makefile' =>
{ SOURCE => 'config/gen/makefiles/editor.in' },
Deleted: trunk/config/gen/makefiles/dynpmc.in
==============================================================================
--- trunk/config/gen/makefiles/dynpmc.in Thu Apr 29 00:43:09 2010 (r46125)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,200 +0,0 @@
-# Copyright (C) 2003-2010, Parrot Foundation.
-# $Id$
-
-PERL = @perl@
-RM_F = @rm_f@
-CP = @cp@
-CHMOD = @chmod@
-LOAD_EXT = @load_ext@
-BUILD_DIR = @build_dir@
-RECONFIGURE = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
-INSTALL_DIR = $(BUILD_DIR)/runtime/parrot/dynext
-O = @o@
-CC = @cc@
-LD = @ld@
-LDFLAGS = @ldflags@ @ld_debug@ @rpath_blib@
-LD_LOAD_FLAGS = @ld_load_flags@
-CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @gc_flag@ @optimize@
-LIBPARROT = @libparrot_ldflags@
-
-BUILD_TOOLS_DIR = $(BUILD_DIR)/tools/build
-BUILD_LIB_DIR = $(BUILD_DIR)/blib/lib
-PMC2C = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl
-INCLUDES = -I$(BUILD_DIR)/include -I at build_dir@/include/pmc
-LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
-
-PMC2CD = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump
-PMC2CC = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --c
-
-# add your dynamic pmcs here
-PMC_TARGETS = \
- dynlexpad$(LOAD_EXT) \
- foo_group$(LOAD_EXT) \
- pccmethod_test$(LOAD_EXT) \
- rotest$(LOAD_EXT) \
- rational$(LOAD_EXT) \
-#IF(has_zlib): gziphandle$(LOAD_EXT) \
- subproxy$(LOAD_EXT)
-
-PMCS_FOO = \
- foo.pmc \
- foo2.pmc
-
-OBJS_FOO = \
- foo$(O) \
- foo2$(O)
-
-#IF(win32 and cc==gcc):LIB_ZLIB = -lz
-#ELSIF(win32):LIB_ZLIB = zlib.lib
-#ELSE:LIB_ZLIB = -lz
-
-CLEANUPS = \
- "*.c" \
- "pmc_*.h" \
- "*_group.h" \
- "*.dump" \
-#IF(o): "*@o@" \
-#IF(win32): "*.lib" \
-#IF(win32): "*.pdb" \
-#IF(win32): "*.ilk" \
-#IF(win32): "*.exp" \
-#IF(win32): "*.def" \
-#IF(win32): "*.manifest" \
-#IF(load_ext): "*@load_ext@"
-
-
-all : install
-
-install : $(PMC_TARGETS)
-#IF(cygwin or hpux): $(CHMOD) 0775 *$(LOAD_EXT)
- $(CP) *$(LOAD_EXT) $(INSTALL_DIR)
-#IF(cygwin or hpux): $(CHMOD) 0775 $(INSTALL_DIR)/*$(LOAD_EXT)
-
-Makefile: ../../config/gen/makefiles/dynpmc.in
- cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::makefiles --target=src/dynpmc/Makefile
-
-dynlexpad$(LOAD_EXT): dynlexpad$(O)
- $(LD) @ld_out at dynlexpad$(LOAD_EXT) dynlexpad$(O) $(LINKARGS)
-#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
-
-dynlexpad$(O): dynlexpad.c
- $(CC) -c @cc_o_out at dynlexpad$(O) $(INCLUDES) $(CFLAGS) dynlexpad.c
-
-dynlexpad.c: dynlexpad.dump
- $(PMC2CC) dynlexpad.pmc
-
-dynlexpad.dump: dynlexpad.pmc
- $(PMC2CD) dynlexpad.pmc
-
-foo_group$(LOAD_EXT): $(OBJS_FOO) lib-foo_group$(O)
- $(LD) @ld_out at foo_group$(LOAD_EXT) lib-foo_group$(O) $(OBJS_FOO) $(LINKARGS)
-#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
-
-lib-foo_group$(O): foo_group.c
- $(CC) -c @cc_o_out at lib-foo_group$(O) $(INCLUDES) $(CFLAGS) foo_group.c
-
-foo_group.c: $(OBJS_FOO)
- $(PMC2C) --library foo_group --c $(PMCS_FOO)
-
-foo$(O): foo.c
- $(CC) -c @cc_o_out at foo$(O) $(INCLUDES) $(CFLAGS) foo.c
-
-foo.c: foo.dump
- $(PMC2CC) foo.pmc
-
-foo.dump: foo.pmc
- $(PMC2CD) foo.pmc
-
-foo2$(O): foo.c foo2.c
- $(CC) -c @cc_o_out at foo2$(O) $(INCLUDES) $(CFLAGS) foo2.c
-
-foo2.c: foo2.dump foo.pmc
- $(PMC2CC) foo2.pmc
-
-foo2.dump: foo2.pmc foo.dump
- $(PMC2CD) foo2.pmc
-
-pccmethod_test$(LOAD_EXT): pccmethod_test$(O)
- $(LD) @ld_out at pccmethod_test$(LOAD_EXT) pccmethod_test$(O) $(LINKARGS)
-#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
-
-pccmethod_test$(O): pccmethod_test.c
- $(CC) -c @cc_o_out at pccmethod_test$(O) $(INCLUDES) $(CFLAGS) pccmethod_test.c
-
-pccmethod_test.c: pccmethod_test.dump
- $(PMC2CC) pccmethod_test.pmc
-
-pccmethod_test.dump: pccmethod_test.pmc
- $(PMC2CD) pccmethod_test.pmc
-
-rotest$(LOAD_EXT): rotest$(O)
- $(LD) @ld_out at rotest$(LOAD_EXT) rotest$(O) $(LINKARGS)
-#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
-
-rotest$(O): rotest.c
- $(CC) -c @cc_o_out at rotest$(O) $(INCLUDES) $(CFLAGS) rotest.c
-
-rotest.c: rotest.dump
- $(PMC2CC) rotest.pmc
-
-rotest.dump: rotest.pmc
- $(PMC2CD) rotest.pmc
-
-rational$(LOAD_EXT): rational$(O)
- $(LD) @ld_out at rational$(LOAD_EXT) rational$(O) $(LINKARGS)
-#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
-
-rational$(O): rational.c
- $(CC) -c @cc_o_out at rational$(O) $(INCLUDES) $(CFLAGS) rational.c
-
-rational.c: rational.dump
- $(PMC2CC) rational.pmc
-
-rational.dump: rational.pmc
- $(PMC2CD) rational.pmc
-
-subproxy$(LOAD_EXT): subproxy$(O)
- $(LD) @ld_out at subproxy$(LOAD_EXT) subproxy$(O) $(LINKARGS)
-#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
-
-subproxy$(O): subproxy.c
- $(CC) -c @cc_o_out at subproxy$(O) $(INCLUDES) $(CFLAGS) subproxy.c
-
-subproxy.c: subproxy.dump
- $(PMC2CC) subproxy.pmc
-
-subproxy.dump: subproxy.pmc
- $(PMC2CD) subproxy.pmc
-
-gziphandle$(LOAD_EXT): gziphandle$(O)
- $(LD) @ld_out at gziphandle$(LOAD_EXT) gziphandle$(O) $(LINKARGS) $(LIB_ZLIB)
-#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
-
-gziphandle$(O): gziphandle.c
- $(CC) -c @cc_o_out at gziphandle$(O) $(INCLUDES) $(CFLAGS) gziphandle.c
-
-gziphandle.c: gziphandle.dump
- $(PMC2CC) gziphandle.pmc
-
-gziphandle.dump: gziphandle.pmc
- $(PMC2CD) gziphandle.pmc
-
-
-test : all
- cd ../.. && $(PERL) -Ilib t/harness t/dynpmc/*.t
-
-testclean :
- $(RM_F) "../../t/dynpmc/*.pir"
-
-clean :
- $(RM_F) $(CLEANUPS)
-
-realclean:
- $(RM_F) $(CLEANUPS) Makefile
-
-distclean: realclean
-
-# Local variables:
-# mode: makefile
-# End:
-# vim: ft=make:
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in Thu Apr 29 00:41:04 2010 (r46125)
+++ trunk/config/gen/makefiles/root.in Thu Apr 29 00:43:09 2010 (r46126)
@@ -68,6 +68,7 @@
PERL = @perl@
CP = @cp@
+MV = @mv@
CHMOD = @chmod@
MKPATH = @mkpath@
RM_F = @rm_f@
@@ -114,6 +115,7 @@
# generated by config/init/headers.pm
NONGEN_HEADERS = @TEMP_nongen_headers@
+include src/dynpmc/Defines.mak
include src/dynoplibs/Defines.mak
include compilers/imcc/Defines.mak
include compilers/pirc/Defines.mak
@@ -142,7 +144,8 @@
ext/Makefile \
src/dynoplibs/Rules.mak \
src/dynoplibs/Defines.mak \
- src/dynpmc/Makefile \
+ src/dynpmc/Rules.mak \
+ src/dynpmc/Defines.mak \
compilers/imcc/Rules.mak
GEN_CONFIGS = \
@@ -615,7 +618,7 @@
runtime/parrot/include/parrotlib.pbc \
runtime/parrot/include/config.fpmc \
$(LIBRARY_DIR)/Test/More.pbc \
- dynpmc \
+ $(DYNPMC_TARGETS) \
$(DYNOPLIBS_TARGETS)
$(GEN_LIBRARY) : $(PARROT) $(GEN_PASM_INCLUDES)
@@ -665,6 +668,7 @@
H2INC = $(BUILD_TOOLS_DIR)/h2inc.pl
# classes PMC build utils and rules
+PMC2C = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl @no_lines_flag@
PMC2CD = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump @no_lines_flag@
PMC2CC = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --c @no_lines_flag@
PMC2CV = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --vtable @no_lines_flag@
@@ -753,11 +757,6 @@
@echo " svnclobber: *Dangerous*: remove everything not in svn."
@echo " reconfig: 'clean' and redo configuration."
@echo ""
- @echo "Dynamic PMCs:"
- @echo " dynpmc: Proxy for default target of src/dynpmc/Makefile"
- @echo " dynpmc-test: Proxy for target 'test' of src/dynpmc/Makefile"
- @echo " dynpmc-clean: Proxy for target 'clean' of src/dynpmc/Makefile"
- @echo ""
@echo "Fetch from source repository:"
@echo " update: svn update."
@echo " status: svn status."
@@ -1515,12 +1514,6 @@
src/io/filehandle$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_filehandle.h \
src/io/io_private.h src/io/filehandle.c
-src/dynpmc/subproxy$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/extend.h \
- $(INC_DIR)/dynext.h include/pmc/pmc_subproxy.h \
- include/pmc/pmc_sub.h include/pmc_default.h \
- include/pmc/pmc_continuation.h include/pmc/pmc_callcontext.h \
- include/pmc/pmc_default.h
-
src/gc/malloc_trace$(O) : src/gc/malloc.c src/gc/malloc_trace.c
src/packfile/pf_items$(O) : $(PARROT_H_HEADERS) src/packfile/pf_items.c
@@ -1610,24 +1603,6 @@
###############################################################################
#
-# dynamic PMC targets:
-#
-###############################################################################
-
-dynpmc : dynpmc.dummy
-
-# XXX this dependancy is too broad, and should be narrowed down
-dynpmc.dummy : $(PARROT) $(INC_DIR)/parrot.h $(INC_DIR)/extend.h $(INC_DIR)/dynext.h $(PMC2C_FILES)
- $(MAKE) src/dynpmc
-
-dynpmc-test : $(PARROT) $(INC_DIR)/parrot.h $(INC_DIR)/extend.h $(INC_DIR)/dynext.h
- $(MAKE) src/dynpmc test
-
-dynpmc-clean :
- $(MAKE) src/dynpmc clean
-
-###############################################################################
-#
# compiler implementation targets:
#
###############################################################################
@@ -1834,7 +1809,6 @@
dynext-clean \
#IF(has_perldoc): docs-clean \
#IF(has_perldoc): html-clean \
- dynpmc-clean \
examples-clean \
ext-clean \
#UNLESS(win32): cover-clean \
@@ -1846,7 +1820,8 @@
$(RM_RF) lib/Parrot/OpLib
$(RM_F) $(NQP_CLEANUPS) $(PGE_CLEANUPS) $(TGE_CLEANUPS)
$(RM_F) $(PIRC_CLEANUPS) $(PCT_CLEANUPS) $(DATA_JSON_CLEANUPS)
- $(RM_F) $(GEN_PASM_INCLUDES) $(GEN_PM_INCLUDES) $(DYNOPLIBS_CLEANUPS)
+ $(RM_F) $(DYNOPLIBS_CLEANUPS) $(DYNPMC_CLEANUPS)
+ $(RM_F) $(GEN_PASM_INCLUDES) $(GEN_PM_INCLUDES)
prog-clean :
$(RM_F) \
@@ -1892,7 +1867,7 @@
src/string/private_cstring.h "src/pmc/*.c" "include/pmc/pmc_*.h" \
"src/pmc/*.dump" vtable.dump "*.def" "*.lib" "*.exp"
-archclean: dynpmc-clean dynext-clean
+archclean: dynext-clean
$(RM_F) \
$(O_FILES) \
$(GEN_CONFIGS) \
@@ -2548,6 +2523,7 @@
malloclist: src/core_pmcs.c
$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl --macro=PARROT_MALLOC $(HEADERIZER_O_FILES)
+include src/dynpmc/Rules.mak
include src/dynoplibs/Rules.mak
include runtime/parrot/library/Rules.mak
include compilers/imcc/Rules.mak
Copied: trunk/src/dynpmc/Defines.in (from r46123, branches/include_dynpmc_makefile/src/dynpmc/Defines.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/dynpmc/Defines.in Thu Apr 29 00:43:09 2010 (r46126, copy of r46123, branches/include_dynpmc_makefile/src/dynpmc/Defines.in)
@@ -0,0 +1,98 @@
+DYNPMC_TARGETS = \
+#IF(has_zlib): $(DYNEXT_DIR)/gziphandle$(LOAD_EXT) \
+ $(DYNEXT_DIR)/dynlexpad$(LOAD_EXT) \
+ $(DYNEXT_DIR)/foo_group$(LOAD_EXT) \
+ $(DYNEXT_DIR)/pccmethod_test$(LOAD_EXT) \
+ $(DYNEXT_DIR)/rotest$(LOAD_EXT) \
+ $(DYNEXT_DIR)/rational$(LOAD_EXT) \
+ $(DYNEXT_DIR)/subproxy$(LOAD_EXT)
+
+DYNPMC_FOO = \
+ src/dynpmc/foo.pmc \
+ src/dynpmc/foo2.pmc
+
+DYNPMC_FOO_OBJS = \
+ src/dynpmc/foo$(O) \
+ src/dynpmc/foo2$(O)
+
+DYNPMC_H_FILES = \
+ include/parrot/caches.h \
+ include/parrot/call.h \
+ include/parrot/cclass.h \
+ include/parrot/charset.h \
+ include/parrot/compiler.h \
+ include/parrot/config.h \
+ include/parrot/context.h \
+ include/parrot/core_pmcs.h \
+ include/parrot/core_types.h \
+ include/parrot/datatypes.h \
+ include/parrot/debugger.h \
+ include/parrot/dynext.h \
+ include/parrot/encoding.h \
+ include/parrot/enums.h \
+ include/parrot/exceptions.h \
+ include/parrot/exit.h \
+ include/parrot/extend.h \
+ include/parrot/extend_vtable.h \
+ include/parrot/feature.h \
+ include/parrot/gc_api.h \
+ include/parrot/global.h \
+ include/parrot/global_setup.h \
+ include/parrot/has_header.h \
+ include/parrot/hash.h \
+ include/parrot/hll.h \
+ include/parrot/interpreter.h \
+ include/parrot/io.h \
+ include/parrot/key.h \
+ include/parrot/library.h \
+ include/parrot/longopt.h \
+ include/parrot/memory.h \
+ include/parrot/misc.h \
+ include/parrot/multidispatch.h \
+ include/parrot/nci.h \
+ include/parrot/oo.h \
+ include/parrot/op.h \
+ include/parrot/oplib.h \
+ include/parrot/packfile.h \
+ include/parrot/parrot.h \
+ include/parrot/pbcversion.h \
+ include/parrot/platform.h \
+ include/parrot/platform_interface.h \
+ include/parrot/platform_limits.h \
+ include/parrot/pmc.h \
+ include/parrot/pmc_freeze.h \
+ include/parrot/pobj.h \
+ include/parrot/scheduler.h \
+ include/parrot/settings.h \
+ include/parrot/stat.h \
+ include/parrot/string.h \
+ include/parrot/string_funcs.h \
+ include/parrot/string_primitives.h \
+ include/parrot/sub.h \
+ include/parrot/thread.h \
+ include/parrot/vtable.h \
+ include/parrot/vtables.h \
+ include/parrot/warnings.h \
+ include/pmc/pmc_callcontext.h \
+ include/pmc/pmc_continuation.h \
+ include/pmc/pmc_default.h
+
+#IF(win32 and cc==gcc):LIB_ZLIB = -lz
+#ELSIF(win32):LIB_ZLIB = zlib.lib
+#ELSE:LIB_ZLIB = -lz
+
+DYNPMC_CLEANUPS = \
+ $(DYNPMC_TARGETS) \
+ $(DYNPMC_FOO_OBJS) \
+ src/dynpmc/*.dump \
+ src/dynpmc/pmc_*.h \
+ src/dynpmc/*_group.h \
+ src/dynpmc/*.c \
+#IF(o): src/dynpmc/*$(O) \
+#IF(win32): src/dynpmc/*.lib" \
+#IF(win32): src/dynpmc/*.pdb" \
+#IF(win32): src/dynpmc/*.ilk" \
+#IF(win32): src/dynpmc/*.exp" \
+#IF(win32): src/dynpmc/*.def" \
+#IF(win32): src/dynpmc/*.manifest" \
+#IF(load_ext): src/dynpmc/*@load_ext@
Copied: trunk/src/dynpmc/Rules.in (from r46123, branches/include_dynpmc_makefile/src/dynpmc/Rules.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/dynpmc/Rules.in Thu Apr 29 00:43:09 2010 (r46126, copy of r46123, branches/include_dynpmc_makefile/src/dynpmc/Rules.in)
@@ -0,0 +1,104 @@
+$(DYNEXT_DIR)/dynlexpad$(LOAD_EXT): src/dynpmc/dynlexpad$(O)
+ $(LD) @ld_out@$(DYNEXT_DIR)/dynlexpad$(LOAD_EXT) src/dynpmc/dynlexpad$(O) $(LINKARGS)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+#IF(cygwin or hpux): $(CHMOD) 0775 $@
+
+src/dynpmc/dynlexpad$(O): src/dynpmc/dynlexpad.c $(DYNPMC_H_FILES)
+
+src/dynpmc/dynlexpad.c: src/dynpmc/dynlexpad.dump
+ $(PMC2CC) src/dynpmc/dynlexpad.pmc
+
+src/dynpmc/dynlexpad.dump: src/dynpmc/dynlexpad.pmc vtable.dump
+ $(PMC2CD) src/dynpmc/dynlexpad.pmc
+
+$(DYNEXT_DIR)/foo_group$(LOAD_EXT): $(DYNPMC_FOO_OBJS) src/dynpmc/foo_group$(O)
+ $(LD) @ld_out@$(DYNEXT_DIR)/foo_group$(LOAD_EXT) src/dynpmc/foo_group$(O) $(DYNPMC_FOO_OBJS) $(LINKARGS)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+#IF(cygwin or hpux): $(CHMOD) 0775 $@
+
+src/dynpmc/foo_group$(O): src/dynpmc/foo.c src/dynpmc/foo2.c $(DYNPMC_H_FILES)
+
+src/dynpmc/foo_group.c: $(DYNPMC_FOO_OBJS)
+ $(PMC2C) --library foo_group --c $(DYNPMC_FOO)
+ $(MV) foo_group.c src/dynpmc/foo_group.c
+
+src/dynpmc/foo$(O): src/dynpmc/foo.c $(DYNPMC_H_FILES)
+
+src/dynpmc/foo.c: src/dynpmc/foo.dump
+ $(PMC2CC) src/dynpmc/foo.pmc
+
+src/dynpmc/foo.dump: src/dynpmc/foo.pmc vtable.dump
+ $(PMC2CD) src/dynpmc/foo.pmc
+
+src/dynpmc/foo2$(O): src/dynpmc/foo2.c $(DYNPMC_H_FILES)
+
+src/dynpmc/foo2.c: src/dynpmc/foo2.dump src/dynpmc/foo.pmc
+ $(PMC2CC) src/dynpmc/foo2.pmc
+
+src/dynpmc/foo2.dump: src/dynpmc/foo2.pmc src/dynpmc/foo.dump vtable.dump
+ $(PMC2CD) src/dynpmc/foo2.pmc
+
+$(DYNEXT_DIR)/pccmethod_test$(LOAD_EXT): src/dynpmc/pccmethod_test$(O)
+ $(LD) @ld_out@$(DYNEXT_DIR)/pccmethod_test$(LOAD_EXT) src/dynpmc/pccmethod_test$(O) $(LINKARGS)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+
+src/dynpmc/pccmethod_test$(O): src/dynpmc/pccmethod_test.c $(DYNPMC_H_FILES)
+
+src/dynpmc/pccmethod_test.c: src/dynpmc/pccmethod_test.dump
+ $(PMC2CC) src/dynpmc/pccmethod_test.pmc
+
+src/dynpmc/pccmethod_test.dump: src/dynpmc/pccmethod_test.pmc vtable.dump
+ $(PMC2CD) src/dynpmc/pccmethod_test.pmc
+
+$(DYNEXT_DIR)/rotest$(LOAD_EXT): src/dynpmc/rotest$(O)
+ $(LD) @ld_out@$(DYNEXT_DIR)/rotest$(LOAD_EXT) src/dynpmc/rotest$(O) $(LINKARGS)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+#IF(cygwin or hpux): $(CHMOD) 0775 $@
+
+src/dynpmc/rotest$(O): src/dynpmc/rotest.c $(DYNPMC_H_FILES)
+
+src/dynpmc/rotest.c: src/dynpmc/rotest.dump
+ $(PMC2CC) src/dynpmc/rotest.pmc
+
+src/dynpmc/rotest.dump: src/dynpmc/rotest.pmc vtable.dump
+ $(PMC2CD) src/dynpmc/rotest.pmc
+
+$(DYNEXT_DIR)/rational$(LOAD_EXT): src/dynpmc/rational$(O)
+ $(LD) @ld_out@$(DYNEXT_DIR)/rational$(LOAD_EXT) src/dynpmc/rational$(O) $(LINKARGS)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+#IF(cygwin or hpux): $(CHMOD) 0775 $@
+
+src/dynpmc/rational$(O): src/dynpmc/rational.c $(DYNPMC_H_FILES)
+
+src/dynpmc/rational.c: src/dynpmc/rational.dump
+ $(PMC2CC) src/dynpmc/rational.pmc
+
+src/dynpmc/rational.dump: src/dynpmc/rational.pmc vtable.dump
+ $(PMC2CD) src/dynpmc/rational.pmc
+
+$(DYNEXT_DIR)/subproxy$(LOAD_EXT): src/dynpmc/subproxy$(O)
+ $(LD) @ld_out@$(DYNEXT_DIR)/subproxy$(LOAD_EXT) src/dynpmc/subproxy$(O) $(LINKARGS)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+#IF(cygwin or hpux): $(CHMOD) 0775 $@
+
+src/dynpmc/subproxy$(O): src/dynpmc/subproxy.c $(DYNPMC_H_FILES)
+
+src/dynpmc/subproxy.c: src/dynpmc/subproxy.dump
+ $(PMC2CC) src/dynpmc/subproxy.pmc
+
+src/dynpmc/subproxy.dump: src/dynpmc/subproxy.pmc vtable.dump
+ $(PMC2CD) src/dynpmc/subproxy.pmc
+
+$(DYNEXT_DIR)/gziphandle$(LOAD_EXT): src/dynpmc/gziphandle$(O)
+ $(LD) @ld_out@$(DYNEXT_DIR)/gziphandle$(LOAD_EXT) src/dynpmc/gziphandle$(O) $(LINKARGS) $(LIB_ZLIB)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+#IF(cygwin or hpux): $(CHMOD) 0775 $@
+
+src/dynpmc/gziphandle$(O): src/dynpmc/gziphandle.c $(DYNPMC_H_FILES)
+
+src/dynpmc/gziphandle.c: src/dynpmc/gziphandle.dump
+ $(PMC2CC) src/dynpmc/gziphandle.pmc
+
+src/dynpmc/gziphandle.dump: src/dynpmc/gziphandle.pmc vtable.dump
+ $(PMC2CD) src/dynpmc/gziphandle.pmc
+
Modified: trunk/tools/dev/checkdepend.pl
==============================================================================
--- trunk/tools/dev/checkdepend.pl Thu Apr 29 00:41:04 2010 (r46125)
+++ trunk/tools/dev/checkdepend.pl Thu Apr 29 00:43:09 2010 (r46126)
@@ -49,7 +49,7 @@
foreach my $file (sort grep /\.[hc]$/, @incfiles) {
# For now, skip any files that have generated dependencies
- next if $file =~ m{src/(ops|dynoplibs|dynpmc|pmc)/};
+ next if $file =~ m{src/(ops|dynoplibs|pmc)/};
next if $file =~ m{src/string/(charset|encoding)/};
open my $fh, '<', $file;
More information about the parrot-commits
mailing list