[gedit-code-assistance] Fixed distcheck
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit-code-assistance] Fixed distcheck
- Date: Sun, 18 Mar 2012 10:35:43 +0000 (UTC)
commit a7f1b91a2fd85dd0499e9caa6624b31042f5ee36
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date: Sun Mar 18 11:33:07 2012 +0100
Fixed distcheck
backends/c/Makefile.am | 5 +++--
data/Makefile.am | 2 ++
src/Makefile.am | 38 +++++++++++++++++++++++++-------------
src/gcp.deps | 8 ++++++++
vapi/Makefile.am | 2 ++
5 files changed, 40 insertions(+), 15 deletions(-)
---
diff --git a/backends/c/Makefile.am b/backends/c/Makefile.am
index bb003b2..0e93b45 100644
--- a/backends/c/Makefile.am
+++ b/backends/c/Makefile.am
@@ -11,8 +11,6 @@ SOURCES = \
gcp-c-semantic-value.vala \
gcp-c-translator.vala
-BUILT_SOURCES = $(vala_sources:.vala=.c)
-
libgcpbackendc_la_SOURCES = $(SOURCES)
libgcpbackendc_la_CFLAGS = $(GCP_CFLAGS) $(LLVM_CFLAGS) $(GEDIT_CFLAGS) -I$(top_srcdir)/src -w
@@ -37,4 +35,7 @@ CLEANFILES = \
install-data-hook:
rm -f $(GCP_BACKENDS_LIBS_DIR)/libgcpbackendc.la
+GITIGNOREFILES = \
+ $(SOURCES:.vala=.c)
+
-include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index d8cc61d..40fbd51 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,3 +7,5 @@ gcpdata_DATA = gcp.css
EXTRA_DIST = \
gcp.plugin \
gcp.css
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index 7fd1746..f74184c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,10 +38,14 @@ SOURCES = \
$(vala_sources) \
gcp-utils-c.c
+BUILT_SOURCES = \
+ gcp.vapi \
+ gcp.h
+
NOINSTHFILES = \
gcp-utils-c.h
-BUILT_SOURCES = $(vala_sources:.vala=.c)
+EXTRA_DIST = $(NOINSTHFILES)
libgcp_la_SOURCES = $(SOURCES)
@@ -65,28 +69,36 @@ INTROSPECTION_COMPILER_ARGS = --includedir $(GEDIT_GIR_DIR)
-include $(INTROSPECTION_MAKEFILE)
girdir = $(GCP_DATA_DIR)/gir-1.0
-gir_DATA = Gcp-3.0.gir
+dist_gir_DATA = Gcp-3.0.gir
typelibdir = $(GCP_LIBS_DIR)/girepository-1.0
-typelib_DATA = $(gir_DATA:.gir=.typelib)
+dist_typelib_DATA = $(dist_gir_DATA:.gir=.typelib)
+
+vapidir = $(datadir)/vala/vapi
+dist_vapi_DATA = \
+ gcp.vapi \
+ gcp.deps
+
+CLEANFILES = \
+ libgcp_la_vala.stamp
+
+MAINTAINERCLEANFILES = \
+ $(dist_gir_DATA) \
+ $(dist_typelib_DATA) \
+ $(BUILT_SOURCES)
-headerdir = $(prefix)/include/gedit-$(GEDIT_API_VERSION)/gcp
-header_DATA = gcp.h
+gcphdir = $(prefix)/include/gedit-$(GEDIT_API_VERSION)/gcp
+gcph_HEADERS = gcp.h
VALAFLAGS = \
--vapidir $(top_srcdir)/vapi \
- --header gcp.h \
+ --H gcp.h \
--vapi gcp.vapi \
--library libgcp \
--gir Gcp-3.0.gir \
$(foreach pkg,$(valapkgs),--pkg $(pkg))
-CLEANFILES = \
- libgcp_la_vala.stamp \
- $(BUILT_SOURCES)
-
-MAINTAINERCLEANFILES = $(generated) $(gir_DATA) $(typelib_DATA)
-
-EXTRA_DIST = gcp.h $(NOINSTHFILES) $(gir_DATA) $(typelib_DATA)
+GITIGNOREFILES = \
+ $(vala_sources:.vala=.c)
-include $(top_srcdir)/git.mk
diff --git a/src/gcp.deps b/src/gcp.deps
new file mode 100644
index 0000000..bb00ea2
--- /dev/null
+++ b/src/gcp.deps
@@ -0,0 +1,8 @@
+gio-2.0
+gee-1.0
+gtk+-3.0
+gtksourceview-3.0
+gedit-3.0
+libpeas-1.0
+gobject-introspection-1.0
+posix
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 23212e0..141a5ed 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -8,6 +8,8 @@ EXTRA_DIST = \
gobject-introspection-1.0.vapi \
gtk+-3.0.deps \
gtk+-3.0.vapi \
+ gobject-introspection-1.0.vapi \
gtksourceview-3.0.vapi \
libpeas-1.0.vapi
+-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]