Fixed compilation under Linux - use $(CLASSLIB_LD) instead of ld!!!
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 06 Sep 2013 12:15:57 +0200
changeset 3238 2d877646264b
parent 3237 44f2b7fd4232
child 3239 666c50f06f0b
Fixed compilation under Linux - use $(CLASSLIB_LD) instead of ld!!! Was fixed in 1.153, but got lost. Be careful!
Make.proto
stx_libview2.st
--- a/Make.proto	Fri Sep 06 00:25:55 2013 +0200
+++ b/Make.proto	Fri Sep 06 12:15:57 2013 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.154 2013-09-05 22:25:39 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.155 2013-09-06 10:15:57 vrany Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview2.
@@ -87,9 +87,9 @@
 	    echo; \
 	    echo "prelinking JPEGReader with libjpeg ..."; \
 	    echo; \
-	    echo ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
+	    echo  $(CLASSLIB_LD) $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
 	    mv JPEGReader.$(O) __JPEGReader.$(O) && \
-	    ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG) && \
+	    $(CLASSLIB_LD) $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG) && \
 	    rm -f __JPEGReader.$(O); \
 	    echo; \
 	fi
--- a/stx_libview2.st	Fri Sep 06 00:25:55 2013 +0200
+++ b/stx_libview2.st	Fri Sep 06 12:15:57 2013 +0200
@@ -173,9 +173,9 @@
 	    echo; \
 	    echo "prelinking JPEGReader with libjpeg ..."; \
 	    echo; \
-	    echo ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
+	    echo $(CLASSLIB_LD) $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
 	    mv JPEGReader.$(O) __JPEGReader.$(O) && \
-	    ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG) && \
+	    $(CLASSLIB_LD) $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG) && \
 	    rm -f __JPEGReader.$(O); \
 	    echo; \
 	fi
@@ -398,10 +398,10 @@
 !stx_libview2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.76 2013-09-05 22:25:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.77 2013-09-06 10:15:57 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.76 2013-09-05 22:25:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.77 2013-09-06 10:15:57 vrany Exp $'
 ! !