From c22677437bedf8ccc88e148973873cde8182a981 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Thu, 24 Dec 2015 14:17:09 -0800
Subject: [PATCH] Fix autotools build

---
 api/sourcefiles.mak              |  2 +-
 moo/mooedit/Makefile.incl        |  2 +-
 moo/mooedit/mooedit-enum-types.c |  9 +++++----
 moo/mooutils/Makefile.incl       | 14 ++++++--------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/api/sourcefiles.mak b/api/sourcefiles.mak
index 16a682a5..4a33b6df 100644
--- a/api/sourcefiles.mak
+++ b/api/sourcefiles.mak
@@ -38,7 +38,7 @@ source_files = \
     ../moo/mooedit/mooedithistoryitem.c\
     ../moo/mooedit/mooedithistoryitem.h\
     ../moo/mooedit/mooedit-impl.h\
-    ../moo/mooedit/mooeditor.c\
+    ../moo/mooedit/mooeditor.cpp\
     ../moo/mooedit/mooeditor.h\
     ../moo/mooedit/mooeditor-impl.h\
     ../moo/mooedit/mooeditor-private.h\
diff --git a/moo/mooedit/Makefile.incl b/moo/mooedit/Makefile.incl
index 078f6527..da60f578 100644
--- a/moo/mooedit/Makefile.incl
+++ b/moo/mooedit/Makefile.incl
@@ -90,7 +90,7 @@ moo_sources +=				\
 	mooedit/mootextview.c		\
 	mooedit/mootextview-input.c	\
 	mooedit/mootextview-private.h   \
-	mooedit/mooeditor.c		\
+	mooedit/mooeditor.cpp		\
 	mooedit/mooeditor-impl.h	\
 	mooedit/mooeditor-private.h	\
 	mooedit/mooeditor-tests.c	\
diff --git a/moo/mooedit/mooedit-enum-types.c b/moo/mooedit/mooedit-enum-types.c
index 5ea4d97b..636a9d2c 100644
--- a/moo/mooedit/mooedit-enum-types.c
+++ b/moo/mooedit/mooedit-enum-types.c
@@ -127,10 +127,11 @@ moo_open_flags_get_type (void)
     if (G_UNLIKELY (!etype))
     {
         static const GFlagsValue values[] = {
-            { MOO_OPEN_FLAG_NEW_WINDOW, (char*) "MOO_OPEN_FLAG_NEW_WINDOW", (char*) "new-window" },
-            { MOO_OPEN_FLAG_NEW_TAB, (char*) "MOO_OPEN_FLAG_NEW_TAB", (char*) "new-tab" },
-            { MOO_OPEN_FLAG_RELOAD, (char*) "MOO_OPEN_FLAG_RELOAD", (char*) "reload" },
-            { MOO_OPEN_FLAG_CREATE_NEW, (char*) "MOO_OPEN_FLAG_CREATE_NEW", (char*) "create-new" },
+            { MOO_OPEN_FLAGS_NONE, (char*) "MOO_OPEN_FLAGS_NONE", (char*) "flags-none" },
+            { MOO_OPEN_FLAG_NEW_WINDOW, (char*) "MOO_OPEN_FLAG_NEW_WINDOW", (char*) "flag-new-window" },
+            { MOO_OPEN_FLAG_NEW_TAB, (char*) "MOO_OPEN_FLAG_NEW_TAB", (char*) "flag-new-tab" },
+            { MOO_OPEN_FLAG_RELOAD, (char*) "MOO_OPEN_FLAG_RELOAD", (char*) "flag-reload" },
+            { MOO_OPEN_FLAG_CREATE_NEW, (char*) "MOO_OPEN_FLAG_CREATE_NEW", (char*) "flag-create-new" },
             { 0, NULL, NULL }
         };
 
diff --git a/moo/mooutils/Makefile.incl b/moo/mooutils/Makefile.incl
index b50ca571..7eacfcaf 100644
--- a/moo/mooutils/Makefile.incl
+++ b/moo/mooutils/Makefile.incl
@@ -108,6 +108,7 @@ moo_sources +=				\
 	mooutils/mooundo.c		\
 	mooutils/mooundo.h		\
 	mooutils/mooutils.h		\
+	mooutils/mooutils-cpp.h		\
 	mooutils/mooutils-debug.h	\
 	mooutils/mooutils-enums.c	\
 	mooutils/mooutils-enums.h	\
@@ -182,7 +183,7 @@ built_moo_sources +=				\
 	mooutils/mooaccelbutton-gxml.h		\
 	mooutils/moologwindow-gxml.h
 
-built_moo_sources += stock-moo.h moofileicon-symlink.h
+built_moo_sources += moo-pixbufs.h
 PIXMAPS =					\
 	mooutils/pixmaps/hide.png		\
 	mooutils/pixmaps/close.png		\
@@ -190,9 +191,11 @@ PIXMAPS =					\
 	mooutils/pixmaps/detach.png		\
 	mooutils/pixmaps/attach.png		\
 	mooutils/pixmaps/keepontop.png		\
-	mooutils/pixmaps/medit.png
+	mooutils/pixmaps/medit.png		\
+	mooutils/pixmaps/symlink.png		\
+	mooutils/pixmaps/symlink-small.png
 EXTRA_DIST += $(PIXMAPS)
-stock-moo.h: $(PIXMAPS)
+moo-pixbufs.h: $(PIXMAPS)
 	$(AM_V_GEN)$(GDK_PIXBUF_CSOURCE) --static --build-list \
 		MOO_HIDE_ICON $(moo_srcdir)/mooutils/pixmaps/hide.png \
 		MOO_CLOSE_ICON $(moo_srcdir)/mooutils/pixmaps/close.png \
@@ -201,11 +204,6 @@ stock-moo.h: $(PIXMAPS)
 		MOO_ATTACH_ICON $(moo_srcdir)/mooutils/pixmaps/attach.png \
 		MOO_KEEP_ON_TOP_ICON $(moo_srcdir)/mooutils/pixmaps/keepontop.png \
 		MEDIT_ICON $(moo_srcdir)/mooutils/pixmaps/medit.png \
-			> $@.tmp && mv $@.tmp $@
-
-EXTRA_DIST += mooutils/pixmaps/symlink.png mooutils/pixmaps/symlink-small.png
-moofileicon-symlink.h: mooutils/pixmaps/symlink.png mooutils/pixmaps/symlink-small.png
-	$(AM_V_GEN)$(GDK_PIXBUF_CSOURCE) --static --build-list \
 		SYMLINK_ARROW $(moo_srcdir)/mooutils/pixmaps/symlink.png \
 		SYMLINK_ARROW_SMALL $(moo_srcdir)/mooutils/pixmaps/symlink-small.png \
 			> $@.tmp && mv $@.tmp $@