[svn:parrot] r44861 - in branches/rm_dynoplibs_make: config/gen/makefiles src/dynoplibs

[darbelo at svn.parrot.org]

Author: darbelo
Date: Thu Mar 11 00:57:32 2010
New Revision: 44861
URL: https://trac.parrot.org/parrot/changeset/44861

Log:
Read the LINKARGS variable, taken from the old dynoplibs template, and use it for linking.

Modified:
   branches/rm_dynoplibs_make/config/gen/makefiles/root.in
   branches/rm_dynoplibs_make/src/dynoplibs/Rules.in

Modified: branches/rm_dynoplibs_make/config/gen/makefiles/root.in
==============================================================================
--- branches/rm_dynoplibs_make/config/gen/makefiles/root.in	Thu Mar 11 00:25:11 2010	(r44860)
+++ branches/rm_dynoplibs_make/config/gen/makefiles/root.in	Thu Mar 11 00:57:32 2010	(r44861)
@@ -109,6 +109,7 @@
 A                = @a@
 LD_SHARE_FLAGS   = @ld_share_flags@
 LD_LOAD_FLAGS    = @ld_load_flags@
+LINKARGS         = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
 
 # generated by config/init/headers.pm
 NONGEN_HEADERS   = @TEMP_nongen_headers@

Modified: branches/rm_dynoplibs_make/src/dynoplibs/Rules.in
==============================================================================
--- branches/rm_dynoplibs_make/src/dynoplibs/Rules.in	Thu Mar 11 00:25:11 2010	(r44860)
+++ branches/rm_dynoplibs_make/src/dynoplibs/Rules.in	Thu Mar 11 00:57:32 2010	(r44861)
@@ -3,7 +3,7 @@
 #
 
 $(DYNEXT_DIR)/obscure_ops$(LOAD_EXT): src/dynoplibs/obscure_ops$(O) $(LIBPARROT)
-	$(LD) @ld_out@$@ src/dynoplibs/obscure_ops$(O) $(LINKFLAGS)
+	$(LD) @ld_out@$@ src/dynoplibs/obscure_ops$(O) $(LINKARGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):	$(CHMOD) 0775 $@
 
@@ -15,7 +15,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl C --dynamic src/dynoplibs/obscure.ops
 
 $(DYNEXT_DIR)/obscure_ops_switch$(LOAD_EXT): src/dynoplibs/obscure_ops_switch$(O) $(LIBPARROT)
-	$(LD) @ld_out@$@ src/dynoplibs/obscure_ops_switch$(O) $(LINKFLAGS)
+	$(LD) @ld_out@$@ src/dynoplibs/obscure_ops_switch$(O) $(LINKARGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):	$(CHMOD) 0775 $@
 
@@ -27,7 +27,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl CSwitch --dynamic src/dynoplibs/obscure.ops
 
 $(DYNEXT_DIR)/obscure_ops_cg$(LOAD_EXT): src/dynoplibs/obscure_ops_cg$(O) $(LIBPARROT)
-	$(LD) @ld_out@$@ src/dynoplibs/obscure_ops_cg$(O) $(LINKFLAGS)
+	$(LD) @ld_out@$@ src/dynoplibs/obscure_ops_cg$(O) $(LINKARGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):	$(CHMOD) 0775 $@
 
@@ -39,7 +39,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl CGoto --dynamic src/dynoplibs/obscure.ops
 
 $(DYNEXT_DIR)/obscure_ops_cgp$(LOAD_EXT): src/dynoplibs/obscure_ops_cgp$(O) $(LIBPARROT)
-	$(LD) @ld_out@$@ src/dynoplibs/obscure_ops_cgp$(O) $(LINKFLAGS)
+	$(LD) @ld_out@$@ src/dynoplibs/obscure_ops_cgp$(O) $(LINKARGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):	$(CHMOD) 0775 $@
 
@@ -51,7 +51,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl CGP --dynamic src/dynoplibs/obscure.ops
 
 $(DYNEXT_DIR)/math_ops$(LOAD_EXT): src/dynoplibs/math_ops$(O) $(LIBPARROT)
-	$(LD) @ld_out@$@ src/dynoplibs/math_ops$(O) $(LINKFLAGS)
+	$(LD) @ld_out@$@ src/dynoplibs/math_ops$(O) $(LINKARGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):	$(CHMOD) 0775 $@
 
@@ -63,7 +63,7 @@
 src/dynoplibs/math_ops.h: src/dynoplibs/math_ops.c
 
 $(DYNEXT_DIR)/math_ops_switch$(LOAD_EXT): src/dynoplibs/math_ops_switch$(O) $(LIBPARROT)
-	$(LD) @ld_out@$@ src/dynoplibs/math_ops_switch$(O) $(LINKFLAGS)
+	$(LD) @ld_out@$@ src/dynoplibs/math_ops_switch$(O) $(LINKARGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):	$(CHMOD) 0775 $@
 
@@ -75,7 +75,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl CSwitch --dynamic src/dynoplibs/math.ops
 
 $(DYNEXT_DIR)/math_ops_cg$(LOAD_EXT): src/dynoplibs/math_ops_cg$(O) $(LIBPARROT)
-	$(LD) @ld_out@$@ src/dynoplibs/math_ops_cg$(O) $(LINKFLAGS)
+	$(LD) @ld_out@$@ src/dynoplibs/math_ops_cg$(O) $(LINKARGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):	$(CHMOD) 0775 $@
 
@@ -87,7 +87,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl CGoto --dynamic src/dynoplibs/math.ops
 
 $(DYNEXT_DIR)/math_ops_cgp$(LOAD_EXT): src/dynoplibs/math_ops_cgp$(O) $(LIBPARROT)
-	$(LD) @ld_out@$@ src/dynoplibs/math_ops_cgp$(O) $(LINKFLAGS)
+	$(LD) @ld_out@$@ src/dynoplibs/math_ops_cgp$(O) $(LINKARGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(cygwin or hpux):	$(CHMOD) 0775 $@