[gobject-introspection] automake: Use the wildcard function where needed. Fixes #160



commit 22d5dcd1d1bc6368bb4a44a64f99c8c3cf2bab76
Author: William Hua <william hua canonical com>
Date:   Thu Aug 25 10:55:51 2016 -0400

    automake: Use the wildcard function where needed. Fixes #160

 Makefile-gir.am | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/Makefile-gir.am b/Makefile-gir.am
index 043765ca..36c8dc60 100644
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -157,7 +157,7 @@ GIO_LIBRARY=gio-2.0
 
 if HAVE_GIO_UNIX
 GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
-GIO_UNIX_HDRS = $(GIO_UNIX_INCLUDEDIR)/gio/*.h
+GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h)
 GIO_UNIX_PACKAGES = gio-unix-2.0
 else
 GIO_UNIX_INCLUDEDIR =
@@ -213,13 +213,13 @@ GIRepository_2_0_gir_CFLAGS = \
     -I$(top_builddir)/girepository \
     -DGI_COMPILATION
 GIRepository_2_0_gir_FILES = \
-        $(top_srcdir)/girepository/girepository.h   \
-        $(top_srcdir)/girepository/girepository.c   \
-        $(top_srcdir)/girepository/gi*info.c       \
-        $(top_srcdir)/girepository/gi*info.h       \
-        $(top_srcdir)/girepository/giversion.c     \
-        $(top_builddir)/girepository/giversion.h    \
-        $(top_srcdir)/girepository/gitypelib.h     \
+        $(top_srcdir)/girepository/girepository.h \
+        $(top_srcdir)/girepository/girepository.c \
+        $(wildcard $(top_srcdir)/girepository/gi*info.c) \
+        $(wildcard $(top_srcdir)/girepository/gi*info.h) \
+        $(top_srcdir)/girepository/giversion.c \
+        $(top_builddir)/girepository/giversion.h \
+        $(top_srcdir)/girepository/gitypelib.h \
         $(top_srcdir)/girepository/gitypes.h
 
 BUILT_GIRSOURCES += GIRepository-2.0.gir


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]