From defcc2db79f9929c61b084e284fb2e42b2b3a791 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 20 Oct 2011 02:28:30 -0400
Subject: [PATCH] Created a utils directory for the recent source additions.
---
Makefile.am | 6 +-----
configure.in | 2 ++
screenlib/SDL_FrameBuf.cpp | 2 +-
utils/Makefile.am | 8 ++++++++
hashtable.c => utils/hashtable.c | 0
hashtable.h => utils/hashtable.h | 0
physfsrwops.c => utils/physfsrwops.c | 0
physfsrwops.h => utils/physfsrwops.h | 0
8 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 utils/Makefile.am
rename hashtable.c => utils/hashtable.c (100%)
rename hashtable.h => utils/hashtable.h (100%)
rename physfsrwops.c => utils/physfsrwops.c (100%)
rename physfsrwops.h => utils/physfsrwops.h (100%)
diff --git a/Makefile.am b/Makefile.am
index 11461d80..aacdb8d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,6 @@ Maelstrom_SOURCES = \
dialog.h \
fastrand.cpp \
fastrand.h \
- hashtable.c \
- hashtable.h \
init.cpp \
load.cpp \
load.h \
@@ -26,8 +24,6 @@ Maelstrom_SOURCES = \
myerror.h \
netscore.cpp \
netscore.h \
- physfsrwops.c \
- physfsrwops.h \
public_key.h \
rect.cpp \
rect.h \
@@ -42,7 +38,7 @@ Maelstrom_LDADD = \
maclib/libSDLmac.a \
@MATHLIB@ @INETLIB@ @ICONOBJ@
-SUBDIRS = $(LOGIC) screenlib maclib
+SUBDIRS = $(LOGIC) screenlib maclib utils
EXTRA_DIST = \
autogen.sh \
diff --git a/configure.in b/configure.in
index b54843aa..75a15fc6 100644
--- a/configure.in
+++ b/configure.in
@@ -92,6 +92,7 @@ CFLAGS="$CFLAGS -I\$(top_srcdir)"
CFLAGS="$CFLAGS -I\$(top_srcdir)/netlogic"
CFLAGS="$CFLAGS -I\$(top_srcdir)/screenlib"
CFLAGS="$CFLAGS -I\$(top_srcdir)/maclib"
+CFLAGS="$CFLAGS -I\$(top_srcdir)/utils"
dnl Set up the icon object file, for Mingw32
case "$target" in
@@ -131,5 +132,6 @@ Makefile
netlogic/Makefile
screenlib/Makefile
maclib/Makefile
+utils/Makefile
Maelstrom.spec
])
diff --git a/screenlib/SDL_FrameBuf.cpp b/screenlib/SDL_FrameBuf.cpp
index ff602b22..ee3c2ad0 100644
--- a/screenlib/SDL_FrameBuf.cpp
+++ b/screenlib/SDL_FrameBuf.cpp
@@ -23,7 +23,7 @@
*/
#include <stdio.h>
-#include "../physfsrwops.h"
+#include "physfsrwops.h"
#include "SDL_FrameBuf.h"
#include "pixel.h"
diff --git a/utils/Makefile.am b/utils/Makefile.am
new file mode 100644
index 00000000..53e41b5a
--- /dev/null
+++ b/utils/Makefile.am
@@ -0,0 +1,8 @@
+
+noinst_LIBRARIES = libutils.a
+
+libutils_a_SOURCES = \
+ hashtable.c \
+ hashtable.h \
+ physfsrwops.c \
+ physfsrwops.h
diff --git a/hashtable.c b/utils/hashtable.c
similarity index 100%
rename from hashtable.c
rename to utils/hashtable.c
diff --git a/hashtable.h b/utils/hashtable.h
similarity index 100%
rename from hashtable.h
rename to utils/hashtable.h
diff --git a/physfsrwops.c b/utils/physfsrwops.c
similarity index 100%
rename from physfsrwops.c
rename to utils/physfsrwops.c
diff --git a/physfsrwops.h b/utils/physfsrwops.h
similarity index 100%
rename from physfsrwops.h
rename to utils/physfsrwops.h