* [PATCH 2/3] Use dist_ prefix as applicable
@ 2011-01-24 12:50 =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
2011-01-24 12:50 ` [PATCH 3/3] Support for pkg-config =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont @ 2011-01-24 12:50 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]
---
Makefile.am | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f941a19..1f09c11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,17 +25,17 @@ local_headers = $(foreach file,$(pkginclude_HEADERS) \
if DATAFILES
dbusconfdir = @DBUS_CONFDIR@
-dbusconf_DATA = src/ofono.conf
+dist_dbusconf_DATA = src/ofono.conf
if SYSTEMD
systemdunitdir = @SYSTEMD_UNITDIR@
-systemdunit_DATA = src/ofono.service
+dist_systemdunit_DATA = src/ofono.service
endif
confdir = $(sysconfdir)/ofono
-conf_DATA =
+dist_conf_DATA =
statedir = $(localstatedir)/lib/ofono
@@ -244,7 +244,7 @@ builtin_modules += phonesim
builtin_sources += plugins/phonesim.c
if DATAFILES
-conf_DATA += plugins/phonesim.conf
+dist_conf_DATA += plugins/phonesim.conf
endif
endif
@@ -477,9 +477,7 @@ testdir = $(pkglibdir)/test
test_SCRIPTS = $(test_scripts)
endif
-conf_files = src/ofono.conf plugins/phonesim.conf
-
-EXTRA_DIST = src/genbuiltin $(conf_files) $(udev_files) \
+EXTRA_DIST = src/genbuiltin $(udev_files) \
$(doc_files) $(test_scripts)
dist_man_MANS = doc/ofonod.8
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] Support for pkg-config
2011-01-24 12:50 [PATCH 2/3] Use dist_ prefix as applicable =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
@ 2011-01-24 12:50 ` =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
2011-01-24 23:20 ` Marcel Holtmann
2011-01-24 23:17 ` [PATCH 2/3] Use dist_ prefix as applicable Marcel Holtmann
2011-01-26 10:23 ` Marcel Holtmann
2 siblings, 1 reply; 5+ messages in thread
From: =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont @ 2011-01-24 12:50 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1990 bytes --]
---
.gitignore | 1 +
Makefile.am | 10 ++++++++--
ofono.pc.in | 10 ++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 ofono.pc.in
diff --git a/.gitignore b/.gitignore
index 7cfb1d9..59308be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ install-sh
libtool
ltmain.sh
missing
+ofono.pc
stamp-h1
autom4te.cache
diff --git a/Makefile.am b/Makefile.am
index 1f09c11..e8570f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,9 @@ local_headers = $(foreach file,$(pkginclude_HEADERS) \
$(nodist_pkginclude_HEADERS), \
include/ofono/$(notdir $(file)))
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ofono.pc
+
if DATAFILES
dbusconfdir = @DBUS_CONFDIR@
@@ -364,7 +367,7 @@ src_ofonod_LDFLAGS = -Wl,--export-dynamic \
BUILT_SOURCES = $(local_headers)
-CLEANFILES = src/builtin.h $(BUILT_SOURCES) $(rules_DATA)
+CLEANFILES = src/builtin.h ofono.pc $(BUILT_SOURCES) $(rules_DATA)
plugindir = $(pkglibdir)/plugins
@@ -477,7 +480,7 @@ testdir = $(pkglibdir)/test
test_SCRIPTS = $(test_scripts)
endif
-EXTRA_DIST = src/genbuiltin $(udev_files) \
+EXTRA_DIST = src/genbuiltin ofono.pc.in $(udev_files) \
$(doc_files) $(test_scripts)
dist_man_MANS = doc/ofonod.8
@@ -572,5 +575,8 @@ include/ofono/%.h: include/%.h
$(AM_V_at)$(MKDIR_P) include/ofono
$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+%.pc: %.pc.in $(builddir)/config.status
+ $(AM_V_GEN)$(SHELL) ./config.status --file=$@ >/dev/null
+
clean-local:
@$(RM) -rf include/ofono
diff --git a/ofono.pc.in b/ofono.pc.in
new file mode 100644
index 0000000..19f12e6
--- /dev/null
+++ b/ofono.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+plugindir=${libdir}/@PACKAGE@/plugins
+includedir=@includedir@
+
+Name: oFono
+Description: oFono - Open Source Telephony
+Version: @VERSION@
+Cflags: -I${includedir}
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 3/3] Support for pkg-config
2011-01-24 12:50 ` [PATCH 3/3] Support for pkg-config =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
@ 2011-01-24 23:20 ` Marcel Holtmann
0 siblings, 0 replies; 5+ messages in thread
From: Marcel Holtmann @ 2011-01-24 23:20 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1861 bytes --]
Hi Remi,
> .gitignore | 1 +
> Makefile.am | 10 ++++++++--
> ofono.pc.in | 10 ++++++++++
> 3 files changed, 19 insertions(+), 2 deletions(-)
> create mode 100644 ofono.pc.in
>
> diff --git a/.gitignore b/.gitignore
> index 7cfb1d9..59308be 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -20,6 +20,7 @@ install-sh
> libtool
> ltmain.sh
> missing
> +ofono.pc
> stamp-h1
> autom4te.cache
>
> diff --git a/Makefile.am b/Makefile.am
> index 1f09c11..e8570f8 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -21,6 +21,9 @@ local_headers = $(foreach file,$(pkginclude_HEADERS) \
> $(nodist_pkginclude_HEADERS), \
> include/ofono/$(notdir $(file)))
>
> +pkgconfigdir = $(libdir)/pkgconfig
> +pkgconfig_DATA = ofono.pc
> +
>
> if DATAFILES
> dbusconfdir = @DBUS_CONFDIR@
> @@ -364,7 +367,7 @@ src_ofonod_LDFLAGS = -Wl,--export-dynamic \
>
> BUILT_SOURCES = $(local_headers)
>
> -CLEANFILES = src/builtin.h $(BUILT_SOURCES) $(rules_DATA)
> +CLEANFILES = src/builtin.h ofono.pc $(BUILT_SOURCES) $(rules_DATA)
>
> plugindir = $(pkglibdir)/plugins
>
> @@ -477,7 +480,7 @@ testdir = $(pkglibdir)/test
> test_SCRIPTS = $(test_scripts)
> endif
>
> -EXTRA_DIST = src/genbuiltin $(udev_files) \
> +EXTRA_DIST = src/genbuiltin ofono.pc.in $(udev_files) \
> $(doc_files) $(test_scripts)
>
> dist_man_MANS = doc/ofonod.8
> @@ -572,5 +575,8 @@ include/ofono/%.h: include/%.h
> $(AM_V_at)$(MKDIR_P) include/ofono
> $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
>
> +%.pc: %.pc.in $(builddir)/config.status
> + $(AM_V_GEN)$(SHELL) ./config.status --file=$@ >/dev/null
> +
I do wanna keep this in sync with ConnMan actually. In ConnMan we create
this one via configure.ac script. So I think we should do the same here
as well.
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] Use dist_ prefix as applicable
2011-01-24 12:50 [PATCH 2/3] Use dist_ prefix as applicable =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
2011-01-24 12:50 ` [PATCH 3/3] Support for pkg-config =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
@ 2011-01-24 23:17 ` Marcel Holtmann
2011-01-26 10:23 ` Marcel Holtmann
2 siblings, 0 replies; 5+ messages in thread
From: Marcel Holtmann @ 2011-01-24 23:17 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
Hi Remi,
> Makefile.am | 12 +++++-------
> 1 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index f941a19..1f09c11 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -25,17 +25,17 @@ local_headers = $(foreach file,$(pkginclude_HEADERS) \
> if DATAFILES
> dbusconfdir = @DBUS_CONFDIR@
>
> -dbusconf_DATA = src/ofono.conf
> +dist_dbusconf_DATA = src/ofono.conf
there was a reason why I did not do this. I need to figure out what it
was or if it is something that doesn't apply to ofono.git tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] Use dist_ prefix as applicable
2011-01-24 12:50 [PATCH 2/3] Use dist_ prefix as applicable =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
2011-01-24 12:50 ` [PATCH 3/3] Support for pkg-config =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
2011-01-24 23:17 ` [PATCH 2/3] Use dist_ prefix as applicable Marcel Holtmann
@ 2011-01-26 10:23 ` Marcel Holtmann
2 siblings, 0 replies; 5+ messages in thread
From: Marcel Holtmann @ 2011-01-26 10:23 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
Hi Remi,
> Makefile.am | 12 +++++-------
> 1 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index f941a19..1f09c11 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -25,17 +25,17 @@ local_headers = $(foreach file,$(pkginclude_HEADERS) \
> if DATAFILES
> dbusconfdir = @DBUS_CONFDIR@
>
> -dbusconf_DATA = src/ofono.conf
> +dist_dbusconf_DATA = src/ofono.conf
so I ran all dist tests on my systems and run the whole build check
process that I am normally running. I can not find any problem with it.
Maybe previously I was using a broken automake version or something like
that. So I am fine with this patch ...
> if SYSTEMD
> systemdunitdir = @SYSTEMD_UNITDIR@
>
> -systemdunit_DATA = src/ofono.service
> +dist_systemdunit_DATA = src/ofono.service
> endif
... however this part is wrong. It is an ofono.service.in file. So
please leave this part out.
> -EXTRA_DIST = src/genbuiltin $(conf_files) $(udev_files) \
> +EXTRA_DIST = src/genbuiltin $(udev_files) \
> $(doc_files) $(test_scripts)
And these fit into one line now. So just put everything in one line.
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-26 10:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-24 12:50 [PATCH 2/3] Use dist_ prefix as applicable =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
2011-01-24 12:50 ` [PATCH 3/3] Support for pkg-config =?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont
2011-01-24 23:20 ` Marcel Holtmann
2011-01-24 23:17 ` [PATCH 2/3] Use dist_ prefix as applicable Marcel Holtmann
2011-01-26 10:23 ` Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox