Mercurial Mercurial > hg > stx-libview2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Tue, 07 May 2013 11:47:51 +0200
changeset 3137 640448ea4068
parent 3136 12809c743dfd
child 3138 236ec2b19a3b
*** empty log message ***
Make.proto file | annotate | diff | comparison | revisions
stx_libview2.st file | annotate | diff | comparison | revisions 
--- a/Make.proto	Tue May 07 09:29:18 2013 +0200
+++ b/Make.proto	Tue May 07 11:47:51 2013 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.143 2013-05-06 14:39:26 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.144 2013-05-07 09:47:51 cg Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview2.
@@ -73,7 +73,7 @@
 #
 # prelink JPEGReader.o with libjpeg
 #
-JPEGReader_prelinked: $(LIBJPEG) $(LIBJPEG_DIR)/libjpeg.a
+JPEGReader_prelinked: $(LIBJPEG)
 	@$(MAKE) JPEGReader.$(O) \
 		CC="$(LIBJPEG_CC)" \
 		OPT="$(LIBJPEG_OPT)" \
@@ -94,8 +94,8 @@
 	    echo; \
 	fi
 
-$(LIBJPEG_DIR)/libjpeg.a: $(LIBJPEG_DIR)/.libs/libjpeg.a
-	cp $(LIBJPEG_DIR)/.libs/libjpeg.a $(LIBJPEG)
+$(LIBJPEG_DIR)/libjpeg.a: $(LIBJPEG_MAKE_LIB)
+	cp $(LIBJPEG_MAKE_LIB) $(LIBJPEG)
 
 $(LIBJPEG_DIR)/.libs/libjpeg.a: $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h
 	@-echo
--- a/stx_libview2.st	Tue May 07 09:29:18 2013 +0200
+++ b/stx_libview2.st	Tue May 07 11:47:51 2013 +0200
@@ -149,7 +149,7 @@
 #
 # prelink JPEGReader.o with libjpeg
 #
-JPEGReader_prelinked: $(LIBJPEG) $(LIBJPEG_DIR)/libjpeg.a
+JPEGReader_prelinked: $(LIBJPEG)
 	@$(MAKE) JPEGReader.$(O) \
 		CC="$(LIBJPEG_CC)" \
 		OPT="$(LIBJPEG_OPT)" \
@@ -170,9 +170,11 @@
 	    echo; \
 	fi
 
-$(LIBJPEG_DIR)/libjpeg.a: $(LIBJPEG_DIR)/.libs/libjpeg.a
-	cp $(LIBJPEG_DIR)/.libs/libjpeg.a $(LIBJPEG)
+$(LIBJPEG_DIR)/libjpeg.a: $(LIBJPEG_MAKE_LIB)
+	cp $(LIBJPEG_MAKE_LIB)/.libs/libjpeg.a $(LIBJPEG)
 
+#the following is needed for linux; LIBJPEG_MAKE_LIB is expanded to: $(LIBJPEG_DIR)/.libs/libjpeg.a
+#do not replace taget below by LIBJPEG_MAKE_LIB, because it may be empty for other systems (osx)
 $(LIBJPEG_DIR)/.libs/libjpeg.a: $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h
 	@-echo
 	@-echo "making libjpeg support library ..."
@@ -381,10 +383,10 @@
 !stx_libview2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.69 2013-05-07 07:29:18 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.70 2013-05-07 09:47:51 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.69 2013-05-07 07:29:18 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.70 2013-05-07 09:47:51 cg Exp $'
 ! !
hg/stx-libview2