summaryrefslogtreecommitdiff
path: root/legacy/edbus
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-09-21 19:56:52 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-09-21 19:56:52 +0000
commitba033df38fca549aa481e3d230467e5539ae86bf (patch)
tree7e7f70b68c8b0a8146d4641a9b5439c834966994 /legacy/edbus
parent675d863dc3ea8c4142b3b10af7c2b144f2f67c6c (diff)
edbus: Rename edbus.pc to edbus2.pc to avoi conflict
Even though the previous library was named E_DBus, it was installing an edbus.pc file. Rename our file so it doesn't conflct with the other. SVN revision: 76995
Diffstat (limited to 'legacy/edbus')
-rw-r--r--legacy/edbus/.gitignore2
-rw-r--r--legacy/edbus/Makefile.am6
-rw-r--r--legacy/edbus/edbus2.pc.in (renamed from legacy/edbus/edbus.pc.in)0
3 files changed, 4 insertions, 4 deletions
diff --git a/legacy/edbus/.gitignore b/legacy/edbus/.gitignore
index 9a1f4e2a60..ee3082cfa8 100644
--- a/legacy/edbus/.gitignore
+++ b/legacy/edbus/.gitignore
@@ -28,7 +28,7 @@ Makefile.in
28missing 28missing
29stamp-h1 29stamp-h1
30edbus-*.tar.* 30edbus-*.tar.*
31edbus.pc 31edbus2.pc
32libedbus.la 32libedbus.la
33src/examples/connman-list-services 33src/examples/connman-list-services
34src/examples/ofono-dial 34src/examples/ofono-dial
diff --git a/legacy/edbus/Makefile.am b/legacy/edbus/Makefile.am
index 6ff713c3fd..625c521ed9 100644
--- a/legacy/edbus/Makefile.am
+++ b/legacy/edbus/Makefile.am
@@ -29,9 +29,9 @@ SED_PROCESS = \
29 $(SED_PROCESS) 29 $(SED_PROCESS)
30 30
31pkgconfigdir = $(libdir)/pkgconfig 31pkgconfigdir = $(libdir)/pkgconfig
32pkgconfig_DATA = edbus.pc 32pkgconfig_DATA = edbus2.pc
33CLEANFILES += edbus.pc 33CLEANFILES += edbus2.pc
34EXTRA_DIST += edbus.pc.in 34EXTRA_DIST += edbus2.pc.in
35 35
36EXTRA_DIST += \ 36EXTRA_DIST += \
37 m4/efl_doxygen.m4 \ 37 m4/efl_doxygen.m4 \
diff --git a/legacy/edbus/edbus.pc.in b/legacy/edbus/edbus2.pc.in
index 7842ec8969..7842ec8969 100644
--- a/legacy/edbus/edbus.pc.in
+++ b/legacy/edbus/edbus2.pc.in