Move demo applications to twin_demos subdirectory

This change moves the twin demo applications to a new subdirectory
(twin_demos), and updates the auto{conf,make} setup to suit.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

17 files changed, 24 insertions, 22 deletions

diff --git a/Makefile.am b/Makefile.am
index 3f25436..9de9f6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AM_CFLAGS = @WARN_CFLAGS@
 AM_LDFLAGS = -version-info @LIB_VERSION@
 
-SUBDIRS=twin_ttf
+SUBDIRS=twin_ttf twin_demos
 
 EXTRA_PROGRAMS = xtwin ftwin
 
@@ -59,29 +59,17 @@ libtwin_mouse_la_LDFLAGS = -version-info=@PACKAGE_VERSION@
 libtwin_mouse_la_SOURCES = twin_linux_mouse.c \
 	twin_linux_mouse.h
 
-demo_sources = twin_demo.c \
-	twin_demo.h \
-	twin_hello.c \
-	twin_hello.h \
-	twin_demoline.c \
-	twin_demoline.h \
-	twin_demospline.c \
-	twin_demospline.h \
-	twin_clock.c \
-	twin_clock.h \
-	twin_calc.c \
-	twin_calc.h \
-	twin_text.c \
-	twin_text.h
-
 libtwin_x11_la_SOURCES = twin_x11.c twin_x11.h
 libtwin_x11_la_CPPFLAGS = @X_CFLAGS@
 
-xtwin_SOURCES =	xtwin.c $(demo_sources)
-xtwin_CPPFLAGS = @X_CFLAGS@
-xtwin_LDADD = libtwin.la libtwin-x11.la @X_LIBS@ -lm
+xtwin_SOURCES =	xtwin.c
+xtwin_CPPFLAGS = @X_CFLAGS@ -I$(top_srcdir)/twin_demos
+xtwin_LDADD = twin_demos/libtwin_demos.a \
+	libtwin.la libtwin-x11.la @X_LIBS@ -lm
 
 libtwin_fbdev_la_SOURCES = twin_fbdev.c twin_fbdev.h
 
-ftwin_SOURCES = ftwin.c $(demo_sources)
-ftwin_LDADD = libtwin.la libtwin-fbdev.la libtwin-mouse.la -lm
+ftwin_SOURCES = ftwin.c
+ftwin_CPPFLAGS = -I$(top_srcdir)/twin_demos
+ftwin_LDADD = twin_demos/libtwin_demos.a \
+	libtwin.la libtwin-fbdev.la libtwin-mouse.la -lm
diff --git a/configure.ac b/configure.ac
index 006c7f2..f2f227a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,4 +80,5 @@ AC_MSG_NOTICE([linux mouse:    $twin_mouse])
 
 AC_OUTPUT([Makefile
            twin.pc
-	   twin_ttf/Makefile])
+	   twin_ttf/Makefile
+	   twin_demos/Makefile])
diff --git a/twin_demos/Makefile.am b/twin_demos/Makefile.am
new file mode 100644
index 0000000..b4020c9
--- /dev/null
+++ b/twin_demos/Makefile.am
@@ -0,0 +1,13 @@
+
+noinst_LIBRARIES = libtwin_demos.a
+
+libtwin_demos_a_CFLAGS = @WARN_CFLAGS@
+libtwin_demos_a_CPPFLAGS = -I$(top_srcdir)
+libtwin_demos_a_SOURCES = twin_calc.c twin_calc.h \
+	twin_clock.c twin_clock.h \
+	twin_demo.c twin_demo.h \
+	twin_demoline.c twin_demoline.h \
+	twin_demospline.c twin_demospline.h \
+	twin_hello.c twin_hello.h \
+	twin_text.c twin_text.h
+
diff --git a/twin_calc.c b/twin_demos/twin_calc.c
index 6b49621..6b49621 100644
--- a/twin_calc.c
+++ b/twin_demos/twin_calc.c
diff --git a/twin_calc.h b/twin_demos/twin_calc.h
index 6fbb2f1..6fbb2f1 100644
--- a/twin_calc.h
+++ b/twin_demos/twin_calc.h
diff --git a/twin_clock.c b/twin_demos/twin_clock.c
index 039ae05..039ae05 100644
--- a/twin_clock.c
+++ b/twin_demos/twin_clock.c
diff --git a/twin_clock.h b/twin_demos/twin_clock.h
index 2259c29..2259c29 100644
--- a/twin_clock.h
+++ b/twin_demos/twin_clock.h
diff --git a/twin_demo.c b/twin_demos/twin_demo.c
index f93e9f4..f93e9f4 100644
--- a/twin_demo.c
+++ b/twin_demos/twin_demo.c
diff --git a/twin_demo.h b/twin_demos/twin_demo.h
index ee4d03c..ee4d03c 100644
--- a/twin_demo.h
+++ b/twin_demos/twin_demo.h
diff --git a/twin_demoline.c b/twin_demos/twin_demoline.c
index 245caa7..245caa7 100644
--- a/twin_demoline.c
+++ b/twin_demos/twin_demoline.c
diff --git a/twin_demoline.h b/twin_demos/twin_demoline.h
index 10dee67..10dee67 100644
--- a/twin_demoline.h
+++ b/twin_demos/twin_demoline.h
diff --git a/twin_demospline.c b/twin_demos/twin_demospline.c
index d425fab..d425fab 100644
--- a/twin_demospline.c
+++ b/twin_demos/twin_demospline.c
diff --git a/twin_demospline.h b/twin_demos/twin_demospline.h
index 8b72455..8b72455 100644
--- a/twin_demospline.h
+++ b/twin_demos/twin_demospline.h
diff --git a/twin_hello.c b/twin_demos/twin_hello.c
index 09cff8d..09cff8d 100644
--- a/twin_hello.c
+++ b/twin_demos/twin_hello.c
diff --git a/twin_hello.h b/twin_demos/twin_hello.h
index a4b92aa..a4b92aa 100644
--- a/twin_hello.h
+++ b/twin_demos/twin_hello.h
diff --git a/twin_text.c b/twin_demos/twin_text.c
index 93efdb4..93efdb4 100644
--- a/twin_text.c
+++ b/twin_demos/twin_text.c
diff --git a/twin_text.h b/twin_demos/twin_text.h
index fe9c482..fe9c482 100644
--- a/twin_text.h
+++ b/twin_demos/twin_text.h