From e95d0ccca5df082f2ab63fc7feb158ad6e9df5d1 Mon Sep 17 00:00:00 2001
From: nick <nick@a97b1542-0b21-0410-a459-e47997c36f34>
Date: Fri, 14 Mar 2008 20:50:26 +0000
Subject: [PATCH] Add src directory

git-svn-id: http://svn.nickg.me.uk/work/xcowsay@294 a97b1542-0b21-0410-a459-e47997c36f34
---
 Makefile.am                              | 10 +---------
 configure.ac                             |  4 ++--
 src/Makefile.am                          |  9 +++++++++
 display_cow.c => src/display_cow.c       |  0
 display_cow.h => src/display_cow.h       |  0
 floating_shape.c => src/floating_shape.c |  0
 floating_shape.h => src/floating_shape.h |  0
 settings.c => src/settings.c             |  0
 settings.h => src/settings.h             |  0
 xcowat => src/xcowat                     |  0
 xcowfortune => src/xcowfortune           |  0
 xcowsay.c => src/xcowsay.c               |  0
 xcowsayd.c => src/xcowsayd.c             |  0
 xcowsayd.h => src/xcowsayd.h             |  0
 14 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 src/Makefile.am
 rename display_cow.c => src/display_cow.c (100%)
 rename display_cow.h => src/display_cow.h (100%)
 rename floating_shape.c => src/floating_shape.c (100%)
 rename floating_shape.h => src/floating_shape.h (100%)
 rename settings.c => src/settings.c (100%)
 rename settings.h => src/settings.h (100%)
 rename xcowat => src/xcowat (100%)
 rename xcowfortune => src/xcowfortune (100%)
 rename xcowsay.c => src/xcowsay.c (100%)
 rename xcowsayd.c => src/xcowsayd.c (100%)
 rename xcowsayd.h => src/xcowsayd.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 90fde6a..e3ce7d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,4 @@
-bin_PROGRAMS = xcowsay
-bin_SCRIPTS = xcowat xcowfortune
-
-AM_CFLAGS = $(XCOWSAY_CFLAGS) -DDATADIR=\"$(pkgdatadir)\"
-LDADD = $(XCOWSAY_LIBS)
-
-xcowsay_SOURCES = xcowsay.c display_cow.c display_cow.h floating_shape.h \
-	floating_shape.c settings.h settings.c Cowsay_glue.h xcowsayd.h \
-	xcowsayd.c
+SUBDIRS = src
 
 dist_pkgdata_DATA = cow_small.png cow_med.png cow_large.png
 EXTRA_DIST = cow.svg xcowat xcowfortune
diff --git a/configure.ac b/configure.ac
index 6d0edf3..8c8cf30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([xcowsay], [0.5],
+AC_INIT([xcowsay], [0.6],
         [Nick Gasson <nick.gasson@yahoo.co.uk>],
         [xcowsay])
 AM_INIT_AUTOMAKE([-Wall])
@@ -34,4 +34,4 @@ AC_ARG_ENABLE(dbus,
 PKG_CHECK_MODULES(XCOWSAY, $modules)
 
 AC_CONFIG_HEADERS([config.h])
-AC_OUTPUT(Makefile)
+AC_OUTPUT([Makefile src/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..4de232d
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,9 @@
+bin_PROGRAMS = xcowsay
+bin_SCRIPTS = xcowat xcowfortune
+
+AM_CFLAGS = $(XCOWSAY_CFLAGS) -DDATADIR=\"$(pkgdatadir)\"
+LDADD = $(XCOWSAY_LIBS)
+
+xcowsay_SOURCES = xcowsay.c display_cow.c display_cow.h floating_shape.h \
+	floating_shape.c settings.h settings.c Cowsay_glue.h xcowsayd.h \
+	xcowsayd.c
diff --git a/display_cow.c b/src/display_cow.c
similarity index 100%
rename from display_cow.c
rename to src/display_cow.c
diff --git a/display_cow.h b/src/display_cow.h
similarity index 100%
rename from display_cow.h
rename to src/display_cow.h
diff --git a/floating_shape.c b/src/floating_shape.c
similarity index 100%
rename from floating_shape.c
rename to src/floating_shape.c
diff --git a/floating_shape.h b/src/floating_shape.h
similarity index 100%
rename from floating_shape.h
rename to src/floating_shape.h
diff --git a/settings.c b/src/settings.c
similarity index 100%
rename from settings.c
rename to src/settings.c
diff --git a/settings.h b/src/settings.h
similarity index 100%
rename from settings.h
rename to src/settings.h
diff --git a/xcowat b/src/xcowat
similarity index 100%
rename from xcowat
rename to src/xcowat
diff --git a/xcowfortune b/src/xcowfortune
similarity index 100%
rename from xcowfortune
rename to src/xcowfortune
diff --git a/xcowsay.c b/src/xcowsay.c
similarity index 100%
rename from xcowsay.c
rename to src/xcowsay.c
diff --git a/xcowsayd.c b/src/xcowsayd.c
similarity index 100%
rename from xcowsayd.c
rename to src/xcowsayd.c
diff --git a/xcowsayd.h b/src/xcowsayd.h
similarity index 100%
rename from xcowsayd.h
rename to src/xcowsayd.h
-- 
2.39.2