[svn:parrot] r46122 - branches/include_dynpmc_makefile/src/dynpmc

darbelo at svn.parrot.org darbelo at svn.parrot.org
Wed Apr 28 23:25:17 UTC 2010


Author: darbelo
Date: Wed Apr 28 23:25:17 2010
New Revision: 46122
URL: https://trac.parrot.org/parrot/changeset/46122

Log:
Some more dep work. Add cleanups.

Modified:
   branches/include_dynpmc_makefile/src/dynpmc/Defines.in
   branches/include_dynpmc_makefile/src/dynpmc/Rules.in

Modified: branches/include_dynpmc_makefile/src/dynpmc/Defines.in
==============================================================================
--- branches/include_dynpmc_makefile/src/dynpmc/Defines.in	Wed Apr 28 21:48:20 2010	(r46121)
+++ branches/include_dynpmc_makefile/src/dynpmc/Defines.in	Wed Apr 28 23:25:17 2010	(r46122)
@@ -33,6 +33,7 @@
     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 \
@@ -54,6 +55,7 @@
     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 \
@@ -68,5 +70,29 @@
     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/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@

Modified: branches/include_dynpmc_makefile/src/dynpmc/Rules.in
==============================================================================
--- branches/include_dynpmc_makefile/src/dynpmc/Rules.in	Wed Apr 28 21:48:20 2010	(r46121)
+++ branches/include_dynpmc_makefile/src/dynpmc/Rules.in	Wed Apr 28 23:25:17 2010	(r46122)
@@ -3,7 +3,7 @@
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):   $(CHMOD) 0775 $@
 
-src/dynpmc/dynlexpad$(O): src/dynpmc/pmc_dynlexpad.h $(DYNPMC_H_FILES)
+src/dynpmc/dynlexpad$(O): src/dynpmc/dynlexpad.c $(DYNPMC_H_FILES)
 
 src/dynpmc/dynlexpad.c: src/dynpmc/dynlexpad.dump
 	$(PMC2CC) src/dynpmc/dynlexpad.pmc
@@ -16,13 +16,13 @@
 #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/pmc_foo.h src/dynpmc/pmc_foo2.h $(DYNPMC_H_FILES)
+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/pmc_foo.h $(DYNPMC_H_FILES)
+src/dynpmc/foo$(O): src/dynpmc/foo.c $(DYNPMC_H_FILES)
 
 src/dynpmc/foo.c: src/dynpmc/foo.dump
 	$(PMC2CC) src/dynpmc/foo.pmc
@@ -30,7 +30,7 @@
 src/dynpmc/foo.dump: src/dynpmc/foo.pmc vtable.dump
 	$(PMC2CD) src/dynpmc/foo.pmc
 
-src/dynpmc/foo2$(O): src/dynpmc/pmc_foo.h src/dynpmc/pmc_foo2.h $(DYNPMC_H_FILES)
+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
@@ -42,7 +42,7 @@
 	$(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/pmc_pccmethod_test.h $(DYNPMC_H_FILES)
+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
@@ -55,7 +55,7 @@
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):   $(CHMOD) 0775 $@
 
-src/dynpmc/rotest$(O): src/dynpmc/pmc_rotest.h $(DYNPMC_H_FILES)
+src/dynpmc/rotest$(O): src/dynpmc/rotest.c $(DYNPMC_H_FILES)
 
 src/dynpmc/rotest.c: src/dynpmc/rotest.dump
 	$(PMC2CC) src/dynpmc/rotest.pmc
@@ -68,7 +68,7 @@
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):   $(CHMOD) 0775 $@
 
-src/dynpmc/rational$(O): src/dynpmc/pmc_rational.h $(DYNPMC_H_FILES)
+src/dynpmc/rational$(O): src/dynpmc/rational.c $(DYNPMC_H_FILES)
 
 src/dynpmc/rational.c: src/dynpmc/rational.dump
 	$(PMC2CC) src/dynpmc/rational.pmc
@@ -81,7 +81,7 @@
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):   $(CHMOD) 0775 $@
 
-src/dynpmc/subproxy$(O): src/dynpmc/pmc_subproxy.h $(DYNPMC_H_FILES)
+src/dynpmc/subproxy$(O): src/dynpmc/subproxy.c $(DYNPMC_H_FILES)
 
 src/dynpmc/subproxy.c: src/dynpmc/subproxy.dump
 	$(PMC2CC) src/dynpmc/subproxy.pmc
@@ -90,11 +90,11 @@
 	$(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)
+	$(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 src/dynpmc/pmc_gziphandle.h $(DYNPMC_H_FILES)
+src/dynpmc/gziphandle$(O): src/dynpmc/gziphandle.c $(DYNPMC_H_FILES)
 
 src/dynpmc/gziphandle.c: src/dynpmc/gziphandle.dump
 	$(PMC2CC) src/dynpmc/gziphandle.pmc


More information about the parrot-commits mailing list