From 94ae7f27812b3de5bd1046b758f5bb95eacc59be Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 6 Mar 2014 19:37:45 +0100
Subject: Include icons folder in distfile.

---
 configure.ac             | 28 ++++++----------------------
 dgedit/Makefile.am       |  3 +++
 dgedit/icons/Makefile.am |  3 +++
 3 files changed, 12 insertions(+), 22 deletions(-)
 create mode 100644 dgedit/icons/Makefile.am

diff --git a/configure.ac b/configure.ac
index 0562059..58b4eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,13 +36,6 @@ if test x$with_experimental == xyes; then
     CXXFLAGS="$CXXFLAGS -DEXPERIMENTAL"
 fi 
 
-#AC_ARG_ENABLE(pugl,  [  --enable-pugl             Build with Pugl support])
-#if test x$enable_pugl == xyes; then
-#    AC_MSG_WARN([*** Building with pugl support!])
-#    CXXFLAGS="$CXXFLAGS -DPUGL -lGL -lGLU -lglut"
-#fi 
-#AM_CONDITIONAL([ENABLE_PUGL], [test "x$enable_pugl" = "xyes"])
-
 dnl ===========================
 dnl Check for GUI backend
 dnl ===========================
@@ -93,7 +86,7 @@ elif test "x$enable_gui" = "xwin32"; then
 elif test "x$enable_gui" = "xpugl"; then
 
   AC_MSG_RESULT([Setting gui backend to Pugl])
-  GUI_CFLAGS="-DPUGL"
+  GUI_CFLAGS="-DPUGL -I../../pugl"
   GUI_LIBS="-lGLU -lGL -lglut"
 
 else 
@@ -105,18 +98,9 @@ AC_SUBST(GUI_LIBS)
 
 AM_CONDITIONAL([ENABLE_PUGL], [test "x$enable_gui" = "xpugl"])
 
-
-
-
-
-
-
-
-
-
-
-
-
+dnl ======================
+dnl Compile unit tests
+dnl ======================
 AC_ARG_WITH(test,  [  --with-test             Build unit tests])
 if test x$with_test == xyes; then
     AC_MSG_WARN([*** Building unittests!])
@@ -527,5 +511,5 @@ AC_OUTPUT(
 	drumgizmo/output/alsa/Makefile
 	drumgizmo/output/jackaudio/Makefile
 	drumgizmo/output/wavfile/Makefile
-  dgedit/Makefile)
-
+  dgedit/Makefile
+  dgedit/icons/Makefile)
diff --git a/dgedit/Makefile.am b/dgedit/Makefile.am
index 38cacca..09bfe22 100644
--- a/dgedit/Makefile.am
+++ b/dgedit/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS = icons
+DISTDIRS = icons
+
 if HAVE_EDITOR
 
 bin_PROGRAMS = dgedit
diff --git a/dgedit/icons/Makefile.am b/dgedit/icons/Makefile.am
new file mode 100644
index 0000000..b838804
--- /dev/null
+++ b/dgedit/icons/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	file.png \
+	master.png
\ No newline at end of file
-- 
cgit v1.2.3