From 002d26bd53a79941bcdd006798feac0bdc1dca18 Mon Sep 17 00:00:00 2001
From: David Griffith <dave@661.org>
Date: Tue, 27 Mar 2018 08:19:34 -0700
Subject: [PATCH] Give dfrotz its own Makefile.  Need to figure out how to not
 link to libpthread.

---
 Makefile          | 26 ++++++++++++++++----------
 src/dumb/Makefile | 26 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 src/dumb/Makefile

diff --git a/Makefile b/Makefile
index 80ffb92..bdbb98f 100644
--- a/Makefile
+++ b/Makefile
@@ -148,11 +148,13 @@ CURSES_OBJECT = $(CURSES_DIR)/ux_init.o \
 	$(CURSES_DIR)/ux_locks.o
 
 DUMB_DIR = $(SRCDIR)/dumb
-DUMB_OBJECT = $(DUMB_DIR)/dumb_init.o \
-	$(DUMB_DIR)/dumb_input.o \
-	$(DUMB_DIR)/dumb_output.o \
-	$(DUMB_DIR)/dumb_pic.o \
-	$(DUMB_DIR)/dumb_blorb.o
+DUMB_LIB = $(DUMB_DIR)/frotz_dumb.a
+
+#DUMB_OBJECT = $(DUMB_DIR)/dumb_init.o \
+#	$(DUMB_DIR)/dumb_input.o \
+#	$(DUMB_DIR)/dumb_output.o \
+#	$(DUMB_DIR)/dumb_pic.o \
+#	$(DUMB_DIR)/dumb_blorb.o
 
 BLORB_DIR = $(SRCDIR)/blorb
 BLORB_OBJECT =  $(BLORB_DIR)/blorblib.o
@@ -164,12 +166,13 @@ SDL_LDFLAGS = `pkg-config $(SDL_PKGS) --libs`
 
 OBJECTS = $(COMMON_OBJECT) $(CURSES_OBJECT) $(DUMB_OBJECT) $(BLORB_OBJECT)
 
-SUBDIRS = $(SDL_DIR)
+SUBDIRS = $(SDL_DIR) $(DUMB_DIR)
 SUB_CLEAN = $(SUBDIRS:%=%-clean)
 
 all: frotz dfrotz sfrotz
 
 $(SDL_LIB): $(SDL_DIR);
+$(DUMB_LIB): $(DUMB_DIR);
 
 $(SUBDIRS):
 	$(MAKE) -C $@
@@ -180,9 +183,9 @@ $(SUB_CLEAN):
 # Main programs
 
 frotz: $(SRCDIR)/frotz_common.a $(SRCDIR)/frotz_curses.a $(SRCDIR)/blorblib.a
-	$(CC) $(CFLAGS) $^ -o $@$(EXTENSION) $(CURSES) $(LDFLAGS)
+	$(CC) $(CFLAGS) $^ -o $@$(EXTENSION) $(CURSES) $(LDFLAGS) $(CURSES_LDFLAGS)
 
-dfrotz:  $(SRCDIR)/frotz_common.a $(SRCDIR)/frotz_dumb.a $(SRCDIR)/blorblib.a
+dfrotz:  $(SRCDIR)/frotz_common.a $(DUMB_LIB) $(SRCDIR)/blorblib.a
 	$(CC) $(CFLAGS) $^ -o $@$(EXTENSION)
 
 sfrotz: $(SRCDIR)/frotz_common.a $(SDL_LIB) $(SRCDIR)/blorblib.a
@@ -203,8 +206,11 @@ $(SRCDIR)/frotz_common.a: $(COMMON_DIR)/git_hash.h $(COMMON_DIR)/defines.h $(COM
 curses_lib: $(SRCDIR)/frotz_curses.a
 $(SRCDIR)/frotz_curses.a: $(CURSES_DIR)/defines.h $(CURSES_OBJECT)
 
-dumb_lib:	$(SRCDIR)/frotz_dumb.a
-$(SRCDIR)/frotz_dumb.a: $(DUMB_OBJECT)
+dumb_lib:	$(DUMB_LIB)
+$(DUMB_LIB):
+
+
+#$(SRCDIR)/frotz_dumb.a: $(DUMB_OBJECT)
 
 blorb_lib:	$(SRCDIR)/blorblib.a
 $(SRCDIR)/blorblib.a: $(BLORB_OBJECT)
diff --git a/src/dumb/Makefile b/src/dumb/Makefile
new file mode 100644
index 0000000..2bee3bf
--- /dev/null
+++ b/src/dumb/Makefile
@@ -0,0 +1,26 @@
+# For GNU Make.
+
+SOURCES = dumb_blorb.c dumb_init.c dumb_input.c dumb_output.c dumb_pic.c
+
+OBJECTS = $(SOURCES:.c=.o)
+
+DEPS = $(SOURCES:.c=.d)
+
+TARGET = frotz_dumb.a
+
+ARFLAGS = rc
+
+.PHONY: clean
+#.DELETE_ON_ERROR:
+
+$(TARGET): $(OBJECTS)
+	$(AR) $(ARFLAGS) $@ $?
+	ranlib $@
+
+clean:
+	-rm -f $(TARGET) $(OBJECTS) $(DEPS)
+
+%.d: %.c
+	$(CC) -MM $(CFLAGS) $< > $@
+
+include $(DEPS)
-- 
2.34.1