summaryrefslogtreecommitdiff
path: root/legacy/ecore
diff options
context:
space:
mode:
authortilman <tilman>2007-03-21 15:30:23 +0000
committertilman <tilman@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2007-03-21 15:30:23 +0000
commit40ca2f85d80ab55687b1db5dda598f541cb9f4ab (patch)
tree0da087de1f722dd67a02b5ff28ac619124035a0a /legacy/ecore
parentf0e280839d9a786d097274c4cf27d54dbb69b177 (diff)
split ecore.pc into multiple pc files, one for each sub module.
SVN revision: 28853
Diffstat (limited to 'legacy/ecore')
-rw-r--r--legacy/ecore/.cvsignore2
-rw-r--r--legacy/ecore/Makefile.am77
-rw-r--r--legacy/ecore/configure.in55
-rw-r--r--legacy/ecore/ecore-con.pc.in11
-rw-r--r--legacy/ecore/ecore-config.pc.in11
-rw-r--r--legacy/ecore/ecore-dbus.pc.in11
-rw-r--r--legacy/ecore/ecore-desktop.pc.in11
-rw-r--r--legacy/ecore/ecore-directfb.pc.in11
-rw-r--r--legacy/ecore/ecore-evas.pc.in11
-rw-r--r--legacy/ecore/ecore-fb.pc.in11
-rw-r--r--legacy/ecore/ecore-file.pc.in11
-rw-r--r--legacy/ecore/ecore-ipc.pc.in11
-rw-r--r--legacy/ecore/ecore-job.pc.in11
-rw-r--r--legacy/ecore/ecore-txt.pc.in11
-rw-r--r--legacy/ecore/ecore-x.pc.in11
-rw-r--r--legacy/ecore/ecore.pc.in6
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
13configure-stamp 13configure-stamp
14depcomp 14depcomp
15ecore-config 15ecore-config
16ecore.pc
17install-sh 16install-sh
18libtool 17libtool
19ltmain.sh 18ltmain.sh
@@ -29,3 +28,4 @@ README
29*.oe 28*.oe
30*.bb 29*.bb
31*.spec 30*.spec
31*.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 \
8 stamp-h.in build-stamp configure-stamp depcomp \ 8 stamp-h.in build-stamp configure-stamp depcomp \
9 ecore_docs.tar.gz ecore.c \ 9 ecore_docs.tar.gz ecore.c \
10 README \ 10 README \
11 ecore.pc \
12 ecore.spec \ 11 ecore.spec \
13 debian/changelog 12 debian/changelog \
13 ecore-con.pc \
14 ecore-config.pc \
15 ecore-dbus.pc \
16 ecore-desktop.pc \
17 ecore-directfb.pc\
18 ecore-evas.pc \
19 ecore-fb.pc \
20 ecore-file.pc \
21 ecore-ipc.pc \
22 ecore-job.pc \
23 ecore-txt.pc \
24 ecore-x.pc \
25 ecore.pc
14 26
15bin_SCRIPTS = ecore-config 27bin_SCRIPTS = ecore-config
16 28
17EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN ecore.c.in gendoc ecore.supp ecore.m4 \ 29EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN ecore.c.in gendoc ecore.supp ecore.m4 \
18 Doxyfile \ 30 Doxyfile \
19 ecore.pc.in \ 31 ecore.pc.in \
20 ecore.pc.in \ 32 ecore-con.pc.in \
33 ecore-config.pc.in \
34 ecore-dbus.pc.in \
35 ecore-desktop.pc.in \
36 ecore-directfb.pc.in\
37 ecore-evas.pc.in \
38 ecore-fb.pc.in \
39 ecore-file.pc.in \
40 ecore-ipc.pc.in \
41 ecore-job.pc.in \
42 ecore-txt.pc.in \
43 ecore-x.pc.in \
21 ecore.spec.in ecore.spec \ 44 ecore.spec.in ecore.spec \
22 debian/changelog \ 45 debian/changelog \
23 debian/changelog.in \ 46 debian/changelog.in \
@@ -44,3 +67,51 @@ m4data_DATA = ecore.m4
44 67
45pkgconfigdir = $(libdir)/pkgconfig 68pkgconfigdir = $(libdir)/pkgconfig
46pkgconfig_DATA = ecore.pc 69pkgconfig_DATA = ecore.pc
70
71if BUILD_ECORE_CON
72pkgconfig_DATA += ecore-con.pc
73endif
74
75if BUILD_ECORE_CONFIG
76pkgconfig_DATA += ecore-config.pc
77endif
78
79if BUILD_ECORE_DBUS
80pkgconfig_DATA += ecore-dbus.pc
81endif
82
83if BUILD_ECORE_DIRECTFB
84pkgconfig_DATA += ecore-directfb.pc
85endif
86
87if BUILD_ECORE_EVAS
88pkgconfig_DATA += ecore-evas.pc
89endif
90
91if BUILD_ECORE_FB
92pkgconfig_DATA += ecore-fb.pc
93endif
94
95if BUILD_ECORE_FILE
96pkgconfig_DATA += ecore-file.pc
97endif
98
99if BUILD_ECORE_DESKTOP
100pkgconfig_DATA += ecore-desktop.pc
101endif
102
103if BUILD_ECORE_IPC
104pkgconfig_DATA += ecore-ipc.pc
105endif
106
107if BUILD_ECORE_JOB
108pkgconfig_DATA += ecore-job.pc
109endif
110
111if BUILD_ECORE_TXT
112pkgconfig_DATA += ecore-txt.pc
113endif
114
115if BUILD_ECORE_X
116pkgconfig_DATA += ecore-x.pc
117endif
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
57fi 57fi
58changequote([,])dnl 58changequote([,])dnl
59 59
60# define pkg-config requirements for all our submodules.
61# only the trivial requirements go here.
62requirements_ecore_con=""
63requirements_ecore_config=""
64requirements_ecore_dbus=""
65requirements_ecore_desktop=""
66requirements_ecore_directfb="directfb"
67requirements_ecore_evas="evas"
68requirements_ecore_fb=""
69requirements_ecore_file=""
70requirements_ecore_ipc=""
71requirements_ecore_job=""
72requirements_ecore_txt=""
73requirements_ecore_x=""
74
60AC_CHECK_FUNCS(gettimeofday) 75AC_CHECK_FUNCS(gettimeofday)
61AC_CHECK_FUNCS(strlcpy) 76AC_CHECK_FUNCS(strlcpy)
62 77
@@ -255,6 +270,7 @@ if test "x$have_ecore_x" = "xyes"; then
255 AC_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat]) 270 AC_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat])
256 AC_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput]) 271 AC_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput])
257 272
273 requirements_ecore_evas="$requirements_ecore_evas ecore-x"
258fi 274fi
259 275
260AC_SUBST(ecore_x_cflags) 276AC_SUBST(ecore_x_cflags)
@@ -369,6 +385,7 @@ if test "x$want_ecore_fb" = "xyes"; then
369 AC_DEFINE(BUILD_ECORE_FB, 1, [Build Ecore_FB Module]) 385 AC_DEFINE(BUILD_ECORE_FB, 1, [Build Ecore_FB Module])
370 have_ecore_fb="yes" 386 have_ecore_fb="yes"
371 ecore_fb_libs="-lecore_fb"; 387 ecore_fb_libs="-lecore_fb";
388 requirements_ecore_evas="$requirements_ecore_evas ecore-fb"
372 ], [ 389 ], [
373 AM_CONDITIONAL(BUILD_ECORE_FB, false) 390 AM_CONDITIONAL(BUILD_ECORE_FB, false)
374 ] 391 ]
@@ -409,7 +426,7 @@ AC_ARG_ENABLE(ecore-evas,
409) 426)
410 427
411if test "x$want_ecore_evas" = "xyes"; then 428if test "x$want_ecore_evas" = "xyes"; then
412 AC_PATH_GENERIC(evas, 0.9.9, 429 PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9],
413 [ 430 [
414 AM_CONDITIONAL(BUILD_ECORE_EVAS, true) 431 AM_CONDITIONAL(BUILD_ECORE_EVAS, true)
415 AC_DEFINE(BUILD_ECORE_EVAS, 1, [Build Ecore_Evas Module]) 432 AC_DEFINE(BUILD_ECORE_EVAS, 1, [Build Ecore_Evas Module])
@@ -659,6 +676,9 @@ if test "x$use_openssl" = "xyes"; then
659 [ 676 [
660 use_openssl=yes 677 use_openssl=yes
661 AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL]) 678 AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL])
679 requirements_ecore_con="$requirements_ecore_con openssl"
680 # no need to add it to req_ecore_{ipc,dbus}, since they
681 # depends on ecore_con anyway.
662 ], 682 ],
663 [ use_openssl=no ] 683 [ use_openssl=no ]
664 ) 684 )
@@ -774,12 +794,13 @@ AC_ARG_ENABLE(ecore-config,
774) 794)
775 795
776if test "x$want_ecore_config" = "xyes"; then 796if test "x$want_ecore_config" = "xyes"; then
777 AC_PATH_GENERIC(eet, 0.9.10, 797 PKG_CHECK_MODULES(EET, [eet >= 0.9.10],
778 [ 798 [
779 AM_CONDITIONAL(BUILD_ECORE_CONFIG, true) 799 AM_CONDITIONAL(BUILD_ECORE_CONFIG, true)
780 AC_DEFINE(BUILD_ECORE_CONFIG, 1, [Build Ecore_Config Module]) 800 AC_DEFINE(BUILD_ECORE_CONFIG, 1, [Build Ecore_Config Module])
781 have_ecore_config="yes" 801 have_ecore_config="yes"
782 ecore_config_libs="-lecore_config"; 802 ecore_config_libs="-lecore_config";
803 requirements_ecore_config="$requirements_ecore_config eet"
783 ], [ 804 ], [
784 AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) 805 AM_CONDITIONAL(BUILD_ECORE_CONFIG, false)
785 ] 806 ]
@@ -924,10 +945,11 @@ if test "x$have_ecore_file" = "xyes"; then
924 ) 945 )
925 946
926 if test "x$use_curl" = "xyes"; then 947 if test "x$use_curl" = "xyes"; then
927 AC_PATH_GENERIC(curl, , 948 PKG_CHECK_MODULES(CURL, libcurl,
928 [ 949 [
929 AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ]) 950 AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ])
930 ecore_file_libs="$ecore_file_libs $CURL_LIBS" 951 ecore_file_libs="$ecore_file_libs $CURL_LIBS"
952 requirements_ecore_file="$requirements_ecore_file libcurl"
931 ], [ 953 ], [
932 use_curl="no" 954 use_curl="no"
933 ] 955 ]
@@ -966,6 +988,7 @@ if test "x$have_ecore_file" = "xyes"; then
966 AC_DEFINE(BUILD_ECORE_DESKTOP, 1, [Build Ecore_Desktop Module]) 988 AC_DEFINE(BUILD_ECORE_DESKTOP, 1, [Build Ecore_Desktop Module])
967 have_ecore_desktop="yes" 989 have_ecore_desktop="yes"
968 ecore_desktop_libs="-lecore_desktop"; 990 ecore_desktop_libs="-lecore_desktop";
991 requirements_ecore_desktop="$requirements_ecore_desktop ecore-file"
969 else 992 else
970 AM_CONDITIONAL(BUILD_ECORE_DESKTOP, false) 993 AM_CONDITIONAL(BUILD_ECORE_DESKTOP, false)
971 fi 994 fi
@@ -1023,11 +1046,33 @@ dnl Checking for Perl:
1023AC_PATH_PROG(PERL,perl,0) 1046AC_PATH_PROG(PERL,perl,0)
1024AC_SUBST(PERL) 1047AC_SUBST(PERL)
1025 1048
1026requirements="" 1049AC_SUBST(requirements_ecore_con)
1027AC_SUBST(requirements) 1050AC_SUBST(requirements_ecore_config)
1051AC_SUBST(requirements_ecore_dbus)
1052AC_SUBST(requirements_ecore_desktop)
1053AC_SUBST(requirements_ecore_directfb)
1054AC_SUBST(requirements_ecore_evas)
1055AC_SUBST(requirements_ecore_fb)
1056AC_SUBST(requirements_ecore_file)
1057AC_SUBST(requirements_ecore_ipc)
1058AC_SUBST(requirements_ecore_job)
1059AC_SUBST(requirements_ecore_txt)
1060AC_SUBST(requirements_ecore_x)
1028 1061
1029AC_OUTPUT([ 1062AC_OUTPUT([
1030Makefile 1063Makefile
1064ecore-con.pc
1065ecore-config.pc
1066ecore-dbus.pc
1067ecore-desktop.pc
1068ecore-directfb.pc
1069ecore-evas.pc
1070ecore-fb.pc
1071ecore-file.pc
1072ecore-ipc.pc
1073ecore-job.pc
1074ecore-txt.pc
1075ecore-x.pc
1031ecore.pc 1076ecore.pc
1032src/Makefile 1077src/Makefile
1033src/bin/Makefile 1078src/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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-con
7Description: E core library, Con module
8Requires: ecore @requirements_ecore_con@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_con @winsock_libs@
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-config
7Description: E core library, Config module
8Requires: ecore @requirements_ecore_config@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_config
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-dbus
7Description: E core library, DBus module
8Requires: ecore-con @requirements_ecore_dbus@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_dbus
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-desktop
7Description: E core library, Desktop module
8Requires: ecore @requirements_ecore_desktop@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_desktop
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-directfb
7Description: E core library, DirectFB module
8Requires: ecore @requirements_ecore_directfb@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_dfb
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-evas
7Description: E core library, Evas module
8Requires: ecore @requirements_ecore_evas@
9Version: @VERSION@
10Libs: -L${libdir} @ecore_evas_libs@
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-fb
7Description: E core library, FB module
8Requires: ecore @requirements_ecore_fb@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_fb
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-file
7Description: E core library, File module
8Requires: ecore @requirements_ecore_file@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_file @fam_libs@
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-ipc
7Description: E core library, IPC module
8Requires: ecore-con @requirements_ecore_ipc@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_ipc
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-job
7Description: E core library, Job module
8Requires: ecore @requirements_ecore_job@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_job
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-txt
7Description: E core library, Text module
8Requires: ecore @requirements_ecore_txt@
9Version: @VERSION@
10Libs: -L${libdir} @ecore_txt_libs@
11Cflags: -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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-x
7Description: E core library, X module
8Requires: ecore-txt @requirements_ecore_x@
9Version: @VERSION@
10Libs: -L${libdir} @ecore_x_libs@ @x_libs@ @Xcursor_libs@ @XRENDER_LIBS@ @XPRINT_LIBS@ @XINERAMA_LIBS@ @XRANDR_LIBS@ @XFIXES_LIBS@ @XDAMAGE_LIBS@ @XSS_LIBS@
11Cflags: -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@
4includedir=@includedir@ 4includedir=@includedir@
5 5
6Name: ecore 6Name: ecore
7Description: Ecore event abstraction library (FIXME) 7Description: Ecore event abstraction library
8Requires: @requirements@ 8Requires:
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -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@ 10Libs: -L${libdir} -lecore -lm
11Cflags: -I${includedir} 11Cflags: -I${includedir}