[svn:parrot] r45063 - in branches/include_dynpmc_makefile: config/gen/makefiles src/dynpmc

[darbelo at svn.parrot.org]

Author: darbelo
Date: Fri Mar 19 13:26:45 2010
New Revision: 45063
URL: https://trac.parrot.org/parrot/changeset/45063

Log:
Pull in some makefile cleanups from the rm_dynpmc_make branch.

Modified:
   branches/include_dynpmc_makefile/config/gen/makefiles/root.in
   branches/include_dynpmc_makefile/src/dynpmc/Defines.in
   branches/include_dynpmc_makefile/src/dynpmc/Rules.in

Modified: branches/include_dynpmc_makefile/config/gen/makefiles/root.in
==============================================================================
--- branches/include_dynpmc_makefile/config/gen/makefiles/root.in	Fri Mar 19 12:32:05 2010	(r45062)
+++ branches/include_dynpmc_makefile/config/gen/makefiles/root.in	Fri Mar 19 13:26:45 2010	(r45063)
@@ -115,8 +115,8 @@
 # generated by config/init/headers.pm
 NONGEN_HEADERS   = @TEMP_nongen_headers@
 
-include src/dynoplibs/Defines.mak
 include src/dynpmc/Defines.mak
+include src/dynoplibs/Defines.mak
 include compilers/imcc/Defines.mak
 include compilers/pirc/Defines.mak
 include compilers/tge/Defines.mak
@@ -1850,7 +1850,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) \
@@ -2505,8 +2505,8 @@
 malloclist: src/core_pmcs.c
 	$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl --macro=PARROT_MALLOC $(HEADERIZER_O_FILES)
 
-include src/dynoplibs/Rules.mak
 include src/dynpmc/Rules.mak
+include src/dynoplibs/Rules.mak
 include runtime/parrot/library/Rules.mak
 include compilers/imcc/Rules.mak
 include compilers/pirc/Rules.mak

Modified: branches/include_dynpmc_makefile/src/dynpmc/Defines.in
==============================================================================
--- branches/include_dynpmc_makefile/src/dynpmc/Defines.in	Fri Mar 19 12:32:05 2010	(r45062)
+++ branches/include_dynpmc_makefile/src/dynpmc/Defines.in	Fri Mar 19 13:26:45 2010	(r45063)
@@ -1,28 +1,45 @@
 DYNPMC_TARGETS = \
-  $(DYNEXT_DIR)/dynlexpad$(LOAD_EXT) \
-  $(DYNEXT_DIR)/foo_group$(LOAD_EXT) \
-  $(DYNEXT_DIR)/pccmethod_test$(LOAD_EXT) \
-  $(DYNEXT_DIR)/rotest$(LOAD_EXT) \
-#IF(has_gdbm):  $(DYNEXT_DIR)/gdbmhash$(LOAD_EXT) \
-  $(DYNEXT_DIR)/rational$(LOAD_EXT) \
-#IF(has_crypto):  $(DYNEXT_DIR)/digest_group$(LOAD_EXT) \
-  $(DYNEXT_DIR)/subproxy$(LOAD_EXT)
-
-DYNPMC_CLEANUPS = \
-  src/dynpmc/*.c \
-  src/dynpmc/pmc_*.h \
-  src/dynpmc/*_group.h \
-  src/dynpmc/*.dump \
-#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@
-
-# Local variables:
-#   mode: makefile
-# End:
-# vim: ft=make:
+    $(DYNEXT_DIR)/dynlexpad$(LOAD_EXT) \
+    $(DYNEXT_DIR)/foo_group$(LOAD_EXT) \
+    $(DYNEXT_DIR)/pccmethod_test$(LOAD_EXT) \
+    $(DYNEXT_DIR)/rotest$(LOAD_EXT) \
+#IF(has_gdbm):    $(DYNEXT_DIR)/gdbmhash$(LOAD_EXT) \
+    $(DYNEXT_DIR)/rational$(LOAD_EXT) \
+#IF(has_crypto):    $(DYNEXT_DIR)/digest_group$(LOAD_EXT) \
+    $(DYNEXT_DIR)/subproxy$(LOAD_EXT)
+
+DYNPMC_DIGEST = \
+    src/dynpmc/md2.pmc \
+    src/dynpmc/md4.pmc \
+    src/dynpmc/md5.pmc \
+    src/dynpmc/ripemd160.pmc \
+    src/dynpmc/sha.pmc \
+    src/dynpmc/sha1.pmc \
+    src/dynpmc/sha256.pmc \
+    src/dynpmc/sha512.pmc
+
+DYNPMC_DIGEST_OBJS = \
+    src/dynpmc/md2$(O) \
+    src/dynpmc/md4$(O) \
+    src/dynpmc/md5$(O) \
+    src/dynpmc/ripemd160$(O) \
+    src/dynpmc/sha$(O) \
+    src/dynpmc/sha1$(O) \
+    src/dynpmc/sha256$(O) \
+    src/dynpmc/sha512$(O)
+
+DYNPMC_FOO = \
+    src/dynpmc/foo.pmc \
+    src/dynpmc/foo2.pmc
+
+DYNPMC_FOO_OBJS = \
+    src/dynpmc/foo$(O) \
+    src/dynpmc/foo2$(O)
+
+#IF(win32 and cc==gcc):LIB_GDBM = -llibgdbm
+#ELSIF(win32):LIB_GDBM = libgdbm.lib
+#ELSE:LIB_GDBM = -lgdbm
+
+#IF(win32 and cc==gcc):LIB_CRYPTO = -lcrypto
+#ELSIF(win32):LIB_CRYPTO = libcrypto.lib
+#ELSE:LIB_CRYPTO = -lcrypto

Modified: branches/include_dynpmc_makefile/src/dynpmc/Rules.in
==============================================================================
--- branches/include_dynpmc_makefile/src/dynpmc/Rules.in	Fri Mar 19 12:32:05 2010	(r45062)
+++ branches/include_dynpmc_makefile/src/dynpmc/Rules.in	Fri Mar 19 13:26:45 2010	(r45063)
@@ -1,39 +1,3 @@
-PMCS_DIGEST = \
-  src/dynpmc/md2.pmc \
-  src/dynpmc/md4.pmc \
-  src/dynpmc/md5.pmc \
-  src/dynpmc/ripemd160.pmc \
-  src/dynpmc/sha.pmc \
-  src/dynpmc/sha1.pmc \
-  src/dynpmc/sha256.pmc \
-  src/dynpmc/sha512.pmc
-
-OBJS_DIGEST = \
-  src/dynpmc/md2$(O) \
-  src/dynpmc/md4$(O) \
-  src/dynpmc/md5$(O) \
-  src/dynpmc/ripemd160$(O) \
-  src/dynpmc/sha$(O) \
-  src/dynpmc/sha1$(O) \
-  src/dynpmc/sha256$(O) \
-  src/dynpmc/sha512$(O)
-
-PMCS_FOO = \
-  src/dynpmc/foo.pmc \
-  src/dynpmc/foo2.pmc
-
-OBJS_FOO = \
-  src/dynpmc/foo$(O) \
-  src/dynpmc/foo2$(O)
-
-#IF(win32 and cc==gcc):LIB_GDBM = -llibgdbm
-#ELSIF(win32):LIB_GDBM = libgdbm.lib
-#ELSE:LIB_GDBM = -lgdbm
-
-#IF(win32 and cc==gcc):LIB_CRYPTO = -lcrypto
-#ELSIF(win32):LIB_CRYPTO = libcrypto.lib
-#ELSE:LIB_CRYPTO = -lcrypto
-
 $(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
@@ -218,13 +182,8 @@
 src/dynpmc/subproxy$(O): src/dynpmc/subproxy.c
 	$(CC) -c @cc_o_out at src/dynpmc/subproxy$(O) $(INCLUDES) $(CFLAGS) src/dynpmc/subproxy.c
 
-src/dynpmc/subproxy.c: src/dynpmc/subproxy.dump
+src/dynpmc/subproxy.c: src/dynpmc/subproxy.dump vtable.dump
 	$(PMC2CC) src/dynpmc/subproxy.pmc
 
-src/dynpmc/subproxy.dump: src/dynpmc/subproxy.pmc
+src/dynpmc/subproxy.dump: src/dynpmc/subproxy.pmc vtable.dump
 	$(PMC2CD) src/dynpmc/subproxy.pmc
-
-# Local variables:
-#   mode: makefile
-# End:
-# vim: ft=make: