Sophie

Sophie

distrib > Mandriva > 2009.1 > i586 > media > main-release-src > by-pkgid > edaf45674119c9ec6304f76a86753895 > files > 4

R-base-2.8.1-6mdv2009.1.src.rpm

diff -Naur R-2.8.1/src/library/grDevices/src/Makefile.in R-2.8.1.tpg/src/library/grDevices/src/Makefile.in
--- R-2.8.1/src/library/grDevices/src/Makefile.in	2008-03-25 12:26:40.000000000 +0000
+++ R-2.8.1.tpg/src/library/grDevices/src/Makefile.in	2008-12-22 21:41:56.000000000 +0000
@@ -23,6 +23,7 @@
 
 # need Defn.h etc, and config.h
 PKG_CPPFLAGS =-I../../../include -I$(top_srcdir)/src/include -DHAVE_CONFIG_H
+PKG_LIBS += $(LIBR) -lR @LIBM@
 @BUILD_AQUA_TRUE@PKG_LIBS=-framework AppKit
 
 all: Makefile Makedeps
diff -Naur R-2.8.1/src/library/grid/src/Makefile.in R-2.8.1.tpg/src/library/grid/src/Makefile.in
--- R-2.8.1/src/library/grid/src/Makefile.in	2006-09-04 14:20:16.000000000 +0000
+++ R-2.8.1.tpg/src/library/grid/src/Makefile.in	2008-12-22 21:43:34.000000000 +0000
@@ -21,7 +21,7 @@
 OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o)
 
 PKG_CFLAGS=$(C_VISIBILITY)
-
+PKG_LIBS += $(LIBR) -lR @LIBM@
 SHLIB = $(pkg)@SHLIB_EXT@
 
 all: Makefile Makedeps
diff -Naur R-2.8.1/src/library/tcltk/src/Makefile.in R-2.8.1.tpg/src/library/tcltk/src/Makefile.in
--- R-2.8.1/src/library/tcltk/src/Makefile.in	2008-03-25 12:26:20.000000000 +0000
+++ R-2.8.1.tpg/src/library/tcltk/src/Makefile.in	2008-12-22 21:41:56.000000000 +0000
@@ -21,7 +21,7 @@
 SHLIB = $(pkg)@SHLIB_EXT@
 
 PKG_CPPFLAGS = @TCLTK_CPPFLAGS@
-PKG_LIBS = @TCLTK_LIBS@ @LIBM@
+PKG_LIBS = @TCLTK_LIBS@ @LIBM@ $(LIBR) -lR
 
 all: Makefile Makedeps
 	@$(MAKE) Makedeps
diff -Naur R-2.8.1/src/modules/X11/Makefile.in R-2.8.1.tpg/src/modules/X11/Makefile.in
--- R-2.8.1/src/modules/X11/Makefile.in	2008-03-25 12:26:45.000000000 +0000
+++ R-2.8.1.tpg/src/modules/X11/Makefile.in	2008-12-22 21:41:56.000000000 +0000
@@ -26,7 +26,7 @@
 
 R_X11_la = R_X11$(SHLIB_EXT)
 ## AIX needs LIBM
-R_X11_la_LIBADD = $(ALL_X_LIBS) $(BITMAP_LIBS) $(LIBR) $(LIBM) @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
+R_X11_la_LIBADD = $(ALL_X_LIBS) $(BITMAP_LIBS) $(LIBR) $(LIBM) -lR @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
 
 all: Makefile Makedeps R
 
diff -Naur R-2.8.1/src/modules/vfonts/Makefile.in R-2.8.1.tpg/src/modules/vfonts/Makefile.in
--- R-2.8.1/src/modules/vfonts/Makefile.in	2007-09-04 22:13:31.000000000 +0000
+++ R-2.8.1.tpg/src/modules/vfonts/Makefile.in	2008-12-22 21:41:56.000000000 +0000
@@ -23,7 +23,7 @@
 
 vfonts_la = vfonts$(SHLIB_EXT)
 ## AIX needs LIBM
-vfonts_la_LIBADD = $(LIBR) $(LIBM) @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
+vfonts_la_LIBADD = $(LIBR) $(LIBM) -lR @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
 
 ALL_CFLAGS = $(ALL_CFLAGS_LO)
 
diff -Naur R-2.8.1/src/nmath/standalone/Makefile.in R-2.8.1.tpg/src/nmath/standalone/Makefile.in
--- R-2.8.1/src/nmath/standalone/Makefile.in	2008-03-25 12:26:44.000000000 +0000
+++ R-2.8.1.tpg/src/nmath/standalone/Makefile.in	2008-12-22 21:41:56.000000000 +0000
@@ -64,6 +64,7 @@
 Rexeclibdir_LTLIBRARIES = $(libRmath_la)
 libRmath_la_SOURCES = $(SOURCES)
 libRmath_la_OBJECTS = $(OBJECTS:.o=.lo)
+libRmath_la_LIBADD = -lR @LIBM@
 libRmath_la_LDFLAGS =
 
 CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES)
diff -Naur R-2.8.1/src/library/Recommended/Makefile.in R-2.8.1.tpg/src/library/Recommended/Makefile.in
--- R-2.8.1/src/library/Recommended/Makefile.in	2008-03-25 12:26:21.000000000 +0000
+++ R-2.8.1.tpg/src/library/Recommended/Makefile.in	2008-12-22 23:41:03.000000000 +0000
@@ -13,6 +13,7 @@
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 DISTFILES = Makefile.in .cvsignore
 R = R_LIBS= $(top_builddir)/bin/R
+PKG_LIBS += $(LIBR) -lR @LIBM@
 
 ## foo.ts is the timestamp for package foo;
 ## foo.tgz is a symlink to foo_x.y-z.tar.gz in the source dir.