[libchamplainmm] champlainmm-gtk: fix Makefile.am



commit 99cc888b6ef3d736d6ff4bbe95c8e45a93762ffa
Author: Juan R. GarcĂ­a Blanco <juanrgar gmail com>
Date:   Sun Aug 10 19:48:06 2014 +0200

    champlainmm-gtk: fix Makefile.am

 champlain-gtk/champlainmm-gtk/Makefile.am |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/champlain-gtk/champlainmm-gtk/Makefile.am b/champlain-gtk/champlainmm-gtk/Makefile.am
index e97105a..5395776 100644
--- a/champlain-gtk/champlainmm-gtk/Makefile.am
+++ b/champlain-gtk/champlainmm-gtk/Makefile.am
@@ -21,11 +21,14 @@ include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
 include $(top_srcdir)/build/compile-binding.am
 
-local_cppflags = $(binding_includes) $(binding_cppflags) -I$(top_srcdir)/champlain/ -DCHAMPLAINMM_GTK_BUILD=1
+local_includes = -I$(top_builddir)/champlain $(if $(srcdir:.=),-I$(top_srcdir)/champlain)
+local_libadd   = $(top_builddir)/champlain/champlainmm/libchamplainmm-$(CHAMPLAINMM_API_VERSION).la
+
+local_cppflags = $(binding_includes) $(local_includes) $(binding_cppflags) -DCHAMPLAINMM_GTK_BUILD=1
 
 AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(CHAMPLAINMM_GTK_CFLAGS)
 AM_CXXFLAGS = $(CHAMPLAINMM_GTK_WXXFLAGS)
 
 libchamplainmm_gtk_ CHAMPLAINMM_GTK_API_VERSION@_la_SOURCES = $(binding_sources)
 libchamplainmm_gtk_ CHAMPLAINMM_GTK_API_VERSION@_la_LDFLAGS = -no-undefined -version-info 
$(CHAMPLAINMM_GTK_SO_VERSION)
-libchamplainmm_gtk_ CHAMPLAINMM_GTK_API_VERSION@_la_LIBADD  = $(CHAMPLAINMM_GTK_LIBS) 
$(top_srcdir)/champlain/champlainmm/libchamplainmm- CHAMPLAINMM_API_VERSION@.la
+libchamplainmm_gtk_ CHAMPLAINMM_GTK_API_VERSION@_la_LIBADD  = $(local_libadd) $(CHAMPLAINMM_GTK_LIBS)


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