commit 1f101a63a60428230549243931356a4c0ee5ca7d
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Wed May 24 21:35:45 2006 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Wed May 24 21:35:45 2006 +0000
Move textscreen GUI demos into an examples/ subdir.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 524
---
configure.in | 1 +
textscreen/Makefile.am | 9 ++-------
textscreen/examples/Makefile.am | 11 +++++++++++
textscreen/{ => examples}/calculator.c | 0
textscreen/{ => examples}/guitest.c | 0
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in
index 1d19deae..aeba3710 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,7 @@ AC_C_BIGENDIAN
AC_OUTPUT([
Makefile
textscreen/Makefile
+textscreen/examples/Makefile
src/Makefile
src/chocolate-doom-res.rc
])
diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am
index 442839fc..d8bee615 100644
--- a/textscreen/Makefile.am
+++ b/textscreen/Makefile.am
@@ -1,9 +1,10 @@
AM_CFLAGS = @SDL_CFLAGS@ -I../src
+SUBDIRS=examples
noinst_LIBRARIES=libtextscreen.a
-bin_PROGRAMS=guitest calculator
+libtextscreen_a_LIBADD = @SDL_LIBS@
libtextscreen_a_SOURCES = \
txt_checkbox.c txt_checkbox.h \
txt_desktop.c txt_desktop.h \
@@ -21,9 +22,3 @@ libtextscreen_a_SOURCES = \
txt_window_action.c txt_window_action.h \
txt_font.h
-guitest_LDADD = @SDL_LIBS@ libtextscreen.a
-guitest_SOURCES = guitest.c
-
-calculator_LDADD = @SDL_LIBS@ libtextscreen.a
-calculator_SOURCES = calculator.c
-
diff --git a/textscreen/examples/Makefile.am b/textscreen/examples/Makefile.am
new file mode 100644
index 00000000..001416c5
--- /dev/null
+++ b/textscreen/examples/Makefile.am
@@ -0,0 +1,11 @@
+
+AM_CFLAGS = @SDL_CFLAGS@ -I.. -I../../src
+
+noinst_PROGRAMS=guitest calculator
+
+guitest_LDADD = @LDFLAGS@ @SDL_LIBS@ ../libtextscreen.a
+guitest_SOURCES = guitest.c
+
+calculator_LDADD = @LDFLAGS@ @SDL_LIBS@ ../libtextscreen.a
+calculator_SOURCES = calculator.c
+
diff --git a/textscreen/calculator.c b/textscreen/examples/calculator.c
similarity index 100%
rename from textscreen/calculator.c
rename to textscreen/examples/calculator.c
diff --git a/textscreen/guitest.c b/textscreen/examples/guitest.c
similarity index 100%
rename from textscreen/guitest.c
rename to textscreen/examples/guitest.c