split ecore.pc into multiple pc files, one for each sub module.

SVN revision: 28853

16 files changed, 260 insertions, 12 deletions

diff --git a/legacy/ecore/.cvsignore b/legacy/ecore/.cvsignore
index e1a7aebb6b..1c7016b691 100644
--- a/legacy/ecore/.cvsignore
+++ b/legacy/ecore/.cvsignore
@@ -13,7 +13,6 @@ configure
 configure-stamp
 depcomp
 ecore-config
-ecore.pc
 install-sh
 libtool
 ltmain.sh
@@ -29,3 +28,4 @@ README
 *.oe
 *.bb
 *.spec
+*.pc
diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am
index 398fa41e78..c119fa31fb 100644
--- a/legacy/ecore/Makefile.am
+++ b/legacy/ecore/Makefile.am
@@ -8,16 +8,39 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        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 @@ m4data_DATA = ecore.m4
 
 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
diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index 05e9ea94d1..c481de3a91 100644
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -57,6 +57,21 @@ if test "x$GCC" = "xyes"; then
 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 @@ if test "x$have_ecore_x" = "xyes"; then
   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 @@ if test "x$want_ecore_fb" = "xyes"; then
           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 @@ AC_ARG_ENABLE(ecore-evas,
 )
 
 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 @@ if test "x$use_openssl" = "xyes"; then
     [
        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 @@ AC_ARG_ENABLE(ecore-config,
 )
 
 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$have_ecore_file" = "xyes"; then
   )
   
   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 @@ if test "x$have_ecore_file" = "xyes"; then
     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 @@ dnl Checking for Perl:
 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
diff --git a/legacy/ecore/ecore-con.pc.in b/legacy/ecore/ecore-con.pc.in
new file mode 100644
index 0000000000..a5c52187c9
--- /dev/null
+++ b/legacy/ecore/ecore-con.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-con
+Description: E core library, Con module
+Requires: ecore @requirements_ecore_con@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_con @winsock_libs@
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-config.pc.in b/legacy/ecore/ecore-config.pc.in
new file mode 100644
index 0000000000..2d11077378
--- /dev/null
+++ b/legacy/ecore/ecore-config.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-config
+Description: E core library, Config module
+Requires: ecore @requirements_ecore_config@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_config
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-dbus.pc.in b/legacy/ecore/ecore-dbus.pc.in
new file mode 100644
index 0000000000..d6c5c29747
--- /dev/null
+++ b/legacy/ecore/ecore-dbus.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-dbus
+Description: E core library, DBus module
+Requires: ecore-con @requirements_ecore_dbus@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_dbus
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-desktop.pc.in b/legacy/ecore/ecore-desktop.pc.in
new file mode 100644
index 0000000000..48b7bf9200
--- /dev/null
+++ b/legacy/ecore/ecore-desktop.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-desktop
+Description: E core library, Desktop module
+Requires: ecore @requirements_ecore_desktop@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_desktop
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-directfb.pc.in b/legacy/ecore/ecore-directfb.pc.in
new file mode 100644
index 0000000000..e4ec4f207b
--- /dev/null
+++ b/legacy/ecore/ecore-directfb.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-directfb
+Description: E core library, DirectFB module
+Requires: ecore @requirements_ecore_directfb@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_dfb
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-evas.pc.in b/legacy/ecore/ecore-evas.pc.in
new file mode 100644
index 0000000000..7c9a487116
--- /dev/null
+++ b/legacy/ecore/ecore-evas.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-evas
+Description: E core library, Evas module
+Requires: ecore @requirements_ecore_evas@
+Version: @VERSION@
+Libs: -L${libdir} @ecore_evas_libs@
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-fb.pc.in b/legacy/ecore/ecore-fb.pc.in
new file mode 100644
index 0000000000..6402ce4b22
--- /dev/null
+++ b/legacy/ecore/ecore-fb.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-fb
+Description: E core library, FB module
+Requires: ecore @requirements_ecore_fb@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_fb
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-file.pc.in b/legacy/ecore/ecore-file.pc.in
new file mode 100644
index 0000000000..1f76aa1064
--- /dev/null
+++ b/legacy/ecore/ecore-file.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-file
+Description: E core library, File module
+Requires: ecore @requirements_ecore_file@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_file @fam_libs@
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-ipc.pc.in b/legacy/ecore/ecore-ipc.pc.in
new file mode 100644
index 0000000000..2dc4beb65c
--- /dev/null
+++ b/legacy/ecore/ecore-ipc.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-ipc
+Description: E core library, IPC module
+Requires: ecore-con @requirements_ecore_ipc@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_ipc
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-job.pc.in b/legacy/ecore/ecore-job.pc.in
new file mode 100644
index 0000000000..fc914a09c2
--- /dev/null
+++ b/legacy/ecore/ecore-job.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-job
+Description: E core library, Job module
+Requires: ecore @requirements_ecore_job@
+Version: @VERSION@
+Libs: -L${libdir} -lecore_job
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-txt.pc.in b/legacy/ecore/ecore-txt.pc.in
new file mode 100644
index 0000000000..1cedb763ab
--- /dev/null
+++ b/legacy/ecore/ecore-txt.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-txt
+Description: E core library, Text module
+Requires: ecore @requirements_ecore_txt@
+Version: @VERSION@
+Libs: -L${libdir} @ecore_txt_libs@
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore-x.pc.in b/legacy/ecore/ecore-x.pc.in
new file mode 100644
index 0000000000..7824428f91
--- /dev/null
+++ b/legacy/ecore/ecore-x.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ecore-x
+Description: E core library, X module
+Requires: ecore-txt @requirements_ecore_x@
+Version: @VERSION@
+Libs: -L${libdir} @ecore_x_libs@ @x_libs@ @Xcursor_libs@ @XRENDER_LIBS@ @XPRINT_LIBS@ @XINERAMA_LIBS@ @XRANDR_LIBS@ @XFIXES_LIBS@ @XDAMAGE_LIBS@ @XSS_LIBS@
+Cflags: -I${includedir}
diff --git a/legacy/ecore/ecore.pc.in b/legacy/ecore/ecore.pc.in
index 39c2c369ab..89be4dde01 100644
--- a/legacy/ecore/ecore.pc.in
+++ b/legacy/ecore/ecore.pc.in
@@ -4,8 +4,8 @@ libdir=@libdir@
 includedir=@includedir@
 
 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}