From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon, 7 Nov 2011 03:42:16 +0000 (+0800)
Subject: Merge branch 'master' into msvc-support-master
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb9e452a36d7a4fe3ed2090c050d096c26aae988;p=profile%2Fivi%2Fclutter.git

Merge branch 'master' into msvc-support-master
---

bb9e452a36d7a4fe3ed2090c050d096c26aae988
diff --cc clutter/Makefile.am
index 5b3d714,e18e08c..7742a92
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@@ -675,48 -769,24 +769,66 @@@ libclutter_@CLUTTER_API_VERSION@_la_LDF
  	$(win32_resources_ldflag) \
  	$(NULL)
  
 +dist-hook: ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj ../build/win32/vs10/clutter.vcxproj.filters
 +
 +../build/win32/vs9/clutter.vcproj: $(top_srcdir)/build/win32/vs9/clutter.vcprojin
 +	for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \
 +		case $$F in \
 +		*.c)	echo '   <File RelativePath="..\..\..\clutter\'$$F'" />' \
 +			;; \
 +		esac; \
 +	done >clutter.sourcefiles
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/clutter.vcprojin >$@
 +	rm clutter.sourcefiles
 +	
 +../build/win32/vs10/clutter.vcxproj: $(top_srcdir)/build/win32/vs10/clutter.vcxprojin
 +	for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \
 +		case $$F in \
 +		*.c)	echo '    <ClCompile Include="..\..\..\clutter\'$$F'" />' \
 +			;; \
 +		esac; \
 +	done >clutter.vs10.sourcefiles
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/clutter.vcxprojin >$@
 +	rm clutter.vs10.sourcefiles
 +	
 +../build/win32/vs10/clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/clutter.vcxproj.filtersin
 +	for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \
 +		case $$F in \
 +		*.c)	echo '    <ClCompile Include="..\..\..\clutter\'$$F'"><Filter>Sources</Filter></ClCompile>' \
 +			;; \
 +		esac; \
 +	done >clutter.vs10.sourcefiles.filters
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/clutter.vcxproj.filtersin >$@
 +	rm clutter.vs10.sourcefiles.filters
 +	
 +EXTRA_DIST += \
 +	clutter-version.h.win32	\
 +	clutter-config.h.win32	\
 +	clutter-version.h.win32.in	\
 +	clutter.symbols	\
 +	$(NULL)
 +
 +# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
 +DISTCLEANFILES += ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj ../build/win32/vs10/clutter.vcxproj.filters
 +
+ install-exec-local:
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	for lib in `echo $(compat_libs)`; do \
+ 	  (cd $(DESTDIR)$(libdir) && \
+ 	    rm -f $$lib.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION); \
+ 	  ) ; \
+ 	  (cd $(DESTDIR)$(libdir) && \
+ 	    { ln -s -f libclutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0 || \
+ 	      { rm -f $$lib.0 && ln -s libclutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0; }; \
+ 	    } \
+ 	  ) ; \
+ 	  (cd $(DESTDIR)$(libdir) && \
+ 	    { ln -s -f libclutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib || \
+ 	      { rm -f $$lib && ln -s libclutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
+ 	    } \
+ 	  ) ; \
+ 	done
+ 
  # gobject-introspection rules
  -include $(INTROSPECTION_MAKEFILE)