[gnome-builder/wip/chergert/libidemm-merge: 14/27] libidemm: build fixes

[Christian Hergert <chergert src gnome org>]

commit 4d4a6196363ab96e003845a0f8252694a7aaff23
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Wed Apr 6 22:53:27 2016 +0200

    libidemm: build fixes

 Makefile.am                    |    2 +-
 libidemm/idemm.h               |    2 +-
 libidemm/idemm/Makefile.am     |    7 ++++++-
 libidemm/src/recentprojects.hg |    2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 144c3ef..e840a5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . build contrib data libide src plugins tools po tests doc help libidemm
+SUBDIRS = . build contrib data libide libidemm src plugins tools po tests doc help
 
 INTLTOOL_FILES = \
        intltool-extract.in \
diff --git a/libidemm/idemm.h b/libidemm/idemm.h
index f2a7824..c45364e 100644
--- a/libidemm/idemm.h
+++ b/libidemm/idemm.h
@@ -5,6 +5,6 @@
 #include <idemm/applicationaddin.h>
 #include <idemm/recentprojects.h>
 #include <idemm/registermmtype.h>
-#include <libidemm/wrap_init.h>
+#include <idemm/wrap_init.h>
 
 #endif
diff --git a/libidemm/idemm/Makefile.am b/libidemm/idemm/Makefile.am
index c0a0b5d..56a8c02 100644
--- a/libidemm/idemm/Makefile.am
+++ b/libidemm/idemm/Makefile.am
@@ -11,5 +11,10 @@ AM_CPPFLAGS = $(local_cppflags) $(IDEMM_CFLAGS) $(libide_cflags)
 AM_CXXFLAGS = $(IDEMM_WXXFLAGS)
 
 libidemm_1_0_la_SOURCES = $(binding_sources)
-libidemm_1_0_la_LDFLAGS = -no-undefined -version-info $(IDEMM_SO_VERSION)
+libidemm_1_0_la_LDFLAGS =
+       $(OPTIMIZE_LDFLAGS) \
+       -avoid-version \
+       -no-undefined \
+       $(NULL)
+
 libidemm_1_0_la_LIBADD  = $(IDEMM_LIBS)
diff --git a/libidemm/src/recentprojects.hg b/libidemm/src/recentprojects.hg
index d9b4e4f..fba86ff 100644
--- a/libidemm/src/recentprojects.hg
+++ b/libidemm/src/recentprojects.hg
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <glibmm.h>
+
 #include <ide.h>
 
 _DEFS(idemm, libide)