[svn:parrot] r43725 - branches/nativecall_pir_build/config/gen/makefiles

plobsing at svn.parrot.org plobsing at svn.parrot.org
Fri Feb 5 05:54:36 UTC 2010


Author: plobsing
Date: Fri Feb  5 05:54:36 2010
New Revision: 43725
URL: https://trac.parrot.org/parrot/changeset/43725

Log:
break dependancy of miniparrot on libparrot

Modified:
   branches/nativecall_pir_build/config/gen/makefiles/root.in

Modified: branches/nativecall_pir_build/config/gen/makefiles/root.in
==============================================================================
--- branches/nativecall_pir_build/config/gen/makefiles/root.in	Fri Feb  5 05:34:05 2010	(r43724)
+++ branches/nativecall_pir_build/config/gen/makefiles/root.in	Fri Feb  5 05:54:36 2010	(r43725)
@@ -505,6 +505,14 @@
 
 OPS_FILES = @ops@ $(GEN_OPSFILES)
 
+O_FILES = \
+    $(INTERP_O_FILES) \
+    $(CHARSET_O_FILES) \
+    $(IO_O_FILES) \
+    $(CLASS_O_FILES) \
+    $(ENCODING_O_FILES) \
+    $(IMCC_O_FILES)
+
 ###############################################################################
 #
 # BUILD TARGET CONFIGURATIONS:
@@ -827,10 +835,10 @@
 	$(PARROT) -o parrot_config.pbc tools/util/parrot-config.pir
 	$(PARROT) pbc_to_exe.pbc parrot_config.pbc
 
-$(MINIPARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+$(MINIPARROT) : src/main$(O) $(GEN_HEADERS) $(O_FILES) \
     lib/Parrot/OpLib/core.pm src/null_config$(O)
 	$(LINK) @ld_out@$@ src/main$(O) src/null_config$(O) \
-	@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
+	$(O_FILES) $(ICU_SHARED) $(C_LIBS) $(LINKFLAGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
 
 $(INSTALLABLEPARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
@@ -887,14 +895,6 @@
         src/io/io_private.h \
         include/pmc/pmc_socket.h
 
-O_FILES = \
-    $(INTERP_O_FILES) \
-    $(CHARSET_O_FILES) \
-    $(IO_O_FILES) \
-    $(CLASS_O_FILES) \
-    $(ENCODING_O_FILES) \
-    $(IMCC_O_FILES)
-
 lib_deps_object : $(O_FILES)
 	$(PERL) tools/dev/lib_deps.pl object $(O_FILES)
 


More information about the parrot-commits mailing list