[gobject-introspection] Do not use install-data-local
- From: Johan Dahlin <johan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Do not use install-data-local
- Date: Mon, 13 Sep 2010 13:36:35 +0000 (UTC)
commit ebefaab70fecba4b10b3413cb1f797bcaea949c5
Author: Johan Dahlin <johan gnome org>
Date: Mon Sep 13 10:33:53 2010 -0300
Do not use install-data-local
Instead use xxxdir + xxx_DATA which uninstalls correctly
tests/Makefile.am | 13 ++++++++-----
tests/scanner/Makefile.am | 6 ++----
2 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index feb0847..77784ef 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,13 @@ CLEANFILES=
INCLUDES = $(GOBJECT_CFLAGS)
LIBADD = $(GOBJECT_LIBS)
+testsdir = $(datadir)/gobject-introspection-1.0/tests
+tests_DATA = \
+ everything.c \
+ everything.h \
+ gimarshallingtests.c \
+ gimarshallingtests.h
+
testlib_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la
testlibdir=$(prefix)/unused
install-testlibLTLIBRARIES: # prevent it from being installed
@@ -43,14 +50,10 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
--namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \
--add-include-path=$(top_builddir)/gir --include=Gio-2.0 \
--library=libgimarshallingtests-1.0.la --output=$@ \
- gimarshallingtests.h gimarshallingtests.c
+ $(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c
%.typelib: %.gir
$(AM_V_GEN) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
check: Everything-1.0.typelib GIMarshallingTests-1.0.typelib
-install-data-local:
- for src in everything.c everything.h gimarshallingtests.c gimarshallingtests.h; do \
- install -m 644 -D $$src $(DESTDIR)$(datadir)/gobject-introspection-1.0/tests/$$src; \
- done
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 0fa9921..0fae2e0 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -28,10 +28,8 @@ libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h
libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h
libregress_la_SOURCES = $(srcdir)/regress.c $(srcdir)/regress.h
-install-data-local:
- for src in $(libregress_la_SOURCES); do \
- install -m 644 -D $$src $(DESTDIR)$(datadir)/gobject-introspection-1.0/tests/$$src; \
- done
+testsdir = $(datadir)/gobject-introspection-1.0/tests
+tests_DATA = $(libregress_la_SOURCES)
libregress_la_CFLAGS = $(AM_CFLAGS) $(CAIRO_CFLAGS)
libregress_la_LDFLAGS = $(AM_LDFLAGS) $(CAIRO_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]