Enlightenment CVS committal
Author : tilman
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
.cvsignore Makefile.am configure.in ecore.pc.in
Added Files:
ecore-con.pc.in ecore-config.pc.in ecore-dbus.pc.in
ecore-desktop.pc.in ecore-directfb.pc.in ecore-evas.pc.in
ecore-fb.pc.in ecore-file.pc.in ecore-ipc.pc.in
ecore-job.pc.in ecore-txt.pc.in ecore-x.pc.in
Log Message:
split ecore.pc into multiple pc files, one for each sub module.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- .cvsignore 24 Aug 2005 15:47:36 -0000 1.10
+++ .cvsignore 21 Mar 2007 15:30:23 -0000 1.11
@@ -13,7 +13,6 @@
configure-stamp
depcomp
ecore-config
-ecore.pc
install-sh
libtool
ltmain.sh
@@ -29,3 +28,4 @@
*.oe
*.bb
*.spec
+*.pc
===================================================================
RCS file: /cvs/e/e17/libs/ecore/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- Makefile.am 28 Oct 2006 11:41:53 -0000 1.29
+++ Makefile.am 21 Mar 2007 15:30:23 -0000 1.30
@@ -8,16 +8,39 @@
stamp-h.in build-stamp configure-stamp depcomp \
ecore_docs.tar.gz ecore.c \
README \
- ecore.pc \
ecore.spec \
- debian/changelog
+ debian/changelog \
+ ecore-con.pc \
+ ecore-config.pc \
+ ecore-dbus.pc \
+ ecore-desktop.pc \
+ ecore-directfb.pc\
+ ecore-evas.pc \
+ ecore-fb.pc \
+ ecore-file.pc \
+ ecore-ipc.pc \
+ ecore-job.pc \
+ ecore-txt.pc \
+ ecore-x.pc \
+ ecore.pc
bin_SCRIPTS = ecore-config
EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN ecore.c.in gendoc ecore.supp
ecore.m4 \
Doxyfile \
ecore.pc.in \
- ecore.pc.in \
+ ecore-con.pc.in \
+ ecore-config.pc.in \
+ ecore-dbus.pc.in \
+ ecore-desktop.pc.in \
+ ecore-directfb.pc.in\
+ ecore-evas.pc.in \
+ ecore-fb.pc.in \
+ ecore-file.pc.in \
+ ecore-ipc.pc.in \
+ ecore-job.pc.in \
+ ecore-txt.pc.in \
+ ecore-x.pc.in \
ecore.spec.in ecore.spec \
debian/changelog \
debian/changelog.in \
@@ -44,3 +67,51 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ecore.pc
+
+if BUILD_ECORE_CON
+pkgconfig_DATA += ecore-con.pc
+endif
+
+if BUILD_ECORE_CONFIG
+pkgconfig_DATA += ecore-config.pc
+endif
+
+if BUILD_ECORE_DBUS
+pkgconfig_DATA += ecore-dbus.pc
+endif
+
+if BUILD_ECORE_DIRECTFB
+pkgconfig_DATA += ecore-directfb.pc
+endif
+
+if BUILD_ECORE_EVAS
+pkgconfig_DATA += ecore-evas.pc
+endif
+
+if BUILD_ECORE_FB
+pkgconfig_DATA += ecore-fb.pc
+endif
+
+if BUILD_ECORE_FILE
+pkgconfig_DATA += ecore-file.pc
+endif
+
+if BUILD_ECORE_DESKTOP
+pkgconfig_DATA += ecore-desktop.pc
+endif
+
+if BUILD_ECORE_IPC
+pkgconfig_DATA += ecore-ipc.pc
+endif
+
+if BUILD_ECORE_JOB
+pkgconfig_DATA += ecore-job.pc
+endif
+
+if BUILD_ECORE_TXT
+pkgconfig_DATA += ecore-txt.pc
+endif
+
+if BUILD_ECORE_X
+pkgconfig_DATA += ecore-x.pc
+endif
===================================================================
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -3 -r1.172 -r1.173
--- configure.in 15 Mar 2007 22:21:26 -0000 1.172
+++ configure.in 21 Mar 2007 15:30:23 -0000 1.173
@@ -57,6 +57,21 @@
fi
changequote([,])dnl
+# define pkg-config requirements for all our submodules.
+# only the trivial requirements go here.
+requirements_ecore_con=""
+requirements_ecore_config=""
+requirements_ecore_dbus=""
+requirements_ecore_desktop=""
+requirements_ecore_directfb="directfb"
+requirements_ecore_evas="evas"
+requirements_ecore_fb=""
+requirements_ecore_file=""
+requirements_ecore_ipc=""
+requirements_ecore_job=""
+requirements_ecore_txt=""
+requirements_ecore_x=""
+
AC_CHECK_FUNCS(gettimeofday)
AC_CHECK_FUNCS(strlcpy)
@@ -255,6 +270,7 @@
AC_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender],
[XRenderFindVisualFormat])
AC_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput])
+ requirements_ecore_evas="$requirements_ecore_evas ecore-x"
fi
AC_SUBST(ecore_x_cflags)
@@ -369,6 +385,7 @@
AC_DEFINE(BUILD_ECORE_FB, 1, [Build Ecore_FB Module])
have_ecore_fb="yes"
ecore_fb_libs="-lecore_fb";
+ requirements_ecore_evas="$requirements_ecore_evas ecore-fb"
], [
AM_CONDITIONAL(BUILD_ECORE_FB, false)
]
@@ -409,7 +426,7 @@
)
if test "x$want_ecore_evas" = "xyes"; then
- AC_PATH_GENERIC(evas, 0.9.9,
+ PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9],
[
AM_CONDITIONAL(BUILD_ECORE_EVAS, true)
AC_DEFINE(BUILD_ECORE_EVAS, 1, [Build Ecore_Evas Module])
@@ -659,6 +676,9 @@
[
use_openssl=yes
AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL])
+ requirements_ecore_con="$requirements_ecore_con openssl"
+ # no need to add it to req_ecore_{ipc,dbus}, since they
+ # depends on ecore_con anyway.
],
[ use_openssl=no ]
)
@@ -774,12 +794,13 @@
)
if test "x$want_ecore_config" = "xyes"; then
- AC_PATH_GENERIC(eet, 0.9.10,
+ PKG_CHECK_MODULES(EET, [eet >= 0.9.10],
[
AM_CONDITIONAL(BUILD_ECORE_CONFIG, true)
AC_DEFINE(BUILD_ECORE_CONFIG, 1, [Build Ecore_Config Module])
have_ecore_config="yes"
ecore_config_libs="-lecore_config";
+ requirements_ecore_config="$requirements_ecore_config eet"
], [
AM_CONDITIONAL(BUILD_ECORE_CONFIG, false)
]
@@ -924,10 +945,11 @@
)
if test "x$use_curl" = "xyes"; then
- AC_PATH_GENERIC(curl, ,
+ PKG_CHECK_MODULES(CURL, libcurl,
[
AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ])
ecore_file_libs="$ecore_file_libs $CURL_LIBS"
+ requirements_ecore_file="$requirements_ecore_file libcurl"
], [
use_curl="no"
]
@@ -966,6 +988,7 @@
AC_DEFINE(BUILD_ECORE_DESKTOP, 1, [Build Ecore_Desktop Module])
have_ecore_desktop="yes"
ecore_desktop_libs="-lecore_desktop";
+ requirements_ecore_desktop="$requirements_ecore_desktop ecore-file"
else
AM_CONDITIONAL(BUILD_ECORE_DESKTOP, false)
fi
@@ -1023,11 +1046,33 @@
AC_PATH_PROG(PERL,perl,0)
AC_SUBST(PERL)
-requirements=""
-AC_SUBST(requirements)
+AC_SUBST(requirements_ecore_con)
+AC_SUBST(requirements_ecore_config)
+AC_SUBST(requirements_ecore_dbus)
+AC_SUBST(requirements_ecore_desktop)
+AC_SUBST(requirements_ecore_directfb)
+AC_SUBST(requirements_ecore_evas)
+AC_SUBST(requirements_ecore_fb)
+AC_SUBST(requirements_ecore_file)
+AC_SUBST(requirements_ecore_ipc)
+AC_SUBST(requirements_ecore_job)
+AC_SUBST(requirements_ecore_txt)
+AC_SUBST(requirements_ecore_x)
AC_OUTPUT([
Makefile
+ecore-con.pc
+ecore-config.pc
+ecore-dbus.pc
+ecore-desktop.pc
+ecore-directfb.pc
+ecore-evas.pc
+ecore-fb.pc
+ecore-file.pc
+ecore-ipc.pc
+ecore-job.pc
+ecore-txt.pc
+ecore-x.pc
ecore.pc
src/Makefile
src/bin/Makefile
===================================================================
RCS file: /cvs/e/e17/libs/ecore/ecore.pc.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.pc.in 20 Feb 2005 12:18:09 -0000 1.5
+++ ecore.pc.in 21 Mar 2007 15:30:23 -0000 1.6
@@ -4,8 +4,8 @@
[EMAIL PROTECTED]@
Name: ecore
-Description: Ecore event abstraction library (FIXME)
-Requires: @requirements@
+Description: Ecore event abstraction library
+Requires:
Version: @VERSION@
-Libs: -L${libdir} -lecore @ecore_txt_libs@ @ecore_x_libs@ @ecore_job_libs@
@ecore_fb_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@
@ecore_config_libs@ @ecore_file_libs@
+Libs: -L${libdir} -lecore -lm
Cflags: -I${includedir}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
