From: Jeonghyun Yun Date: Thu, 5 Apr 2012 10:44:18 +0000 (+0900) Subject: Elementary migration revision 69922 X-Git-Tag: sbs/armel/slp2-target~55^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7be8f0f90b2c9b5a8b11d964b9e7d87fdfbf766c;p=framework%2Fuifw%2Felementary.git Elementary migration revision 69922 Merge remote-tracking branch 'remotes/origin/upstream' Conflicts: src/lib/elm_gen_common.h src/lib/elm_genlist.c src/lib/elm_genlist.h --- 7be8f0f90b2c9b5a8b11d964b9e7d87fdfbf766c diff --cc elementary.pc.in index b0bc2a1,b0bc2a1..9ad55ff --- a/elementary.pc.in +++ b/elementary.pc.in @@@ -5,6 -5,6 +5,8 @@@ includedir=@includedir Name: elementary Description: Mobile device touchscreen widget library ++@pkgconfig_requires_private@: @requirement_elm@ Version: @VERSION@ Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @EVIL_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_ECORE_IMF_LIBS@ @ELEMENTARY_ECORE_CON_LIBS@ ++Libs.private: @dlopen_libs@ @my_libs@ @ELEMENTARY_LIBS@ @EVIL_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_ECORE_IMF_LIBS@ @ELEMENTARY_ECORE_CON_LIBS@ Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_CFLAGS@ @EVIL_CFLAGS@ @ELEMENTARY_EFREET_CFLAGS@ @ELEMENTARY_EDBUS_CFLAGS@ @ELEMENTARY_ETHUMB_CFLAGS@ @ELEMENTARY_WEB_CFLAGS@ @ELEMENTARY_EMAP_CFLAGS@ @ELEMENTARY_ECORE_IMF_CFLAGS@ @ELEMENTARY_ECORE_CON_CFLAGS@ diff --cc src/bin/test_win_socket.c index d8b87ba,223bb57..223bb57 mode 100755,100644..100755 --- a/src/bin/test_win_socket.c +++ b/src/bin/test_win_socket.c