From: David Griffith <dave@661.org>
Date: Tue, 27 Mar 2018 15:44:06 +0000 (-0700)
Subject: Give blorblib it's own Makefile.
X-Git-Url: https://scope-eye.net/git/?a=commitdiff_plain;h=220081847ab7629e5c8e4937b65b3392d1f90c32;p=liskon_frotz.git

Give blorblib it's own Makefile.
---

diff --git a/Makefile b/Makefile
index bdbb98f..0437381 100644
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,8 @@ DUMB_LIB = $(DUMB_DIR)/frotz_dumb.a
 #	$(DUMB_DIR)/dumb_blorb.o
 
 BLORB_DIR = $(SRCDIR)/blorb
-BLORB_OBJECT =  $(BLORB_DIR)/blorblib.o
+BLORB_LIB = $(BLORB_DIR)/blorblib.a
+#BLORB_OBJECT =  $(BLORB_DIR)/blorblib.o
 
 SDL_DIR = $(SRCDIR)/sdl
 SDL_LIB = $(SDL_DIR)/frotz_sdl.a
@@ -166,13 +167,14 @@ SDL_LDFLAGS = `pkg-config $(SDL_PKGS) --libs`
 
 OBJECTS = $(COMMON_OBJECT) $(CURSES_OBJECT) $(DUMB_OBJECT) $(BLORB_OBJECT)
 
-SUBDIRS = $(SDL_DIR) $(DUMB_DIR)
+SUBDIRS = $(SDL_DIR) $(DUMB_DIR) $(BLORB_DIR)
 SUB_CLEAN = $(SUBDIRS:%=%-clean)
 
 all: frotz dfrotz sfrotz
 
 $(SDL_LIB): $(SDL_DIR);
 $(DUMB_LIB): $(DUMB_DIR);
+$(BLORB_LIB): $(BLORB_DIR);
 
 $(SUBDIRS):
 	$(MAKE) -C $@
@@ -182,13 +184,13 @@ $(SUB_CLEAN):
 
 # Main programs
 
-frotz: $(SRCDIR)/frotz_common.a $(SRCDIR)/frotz_curses.a $(SRCDIR)/blorblib.a
+frotz: $(SRCDIR)/frotz_common.a $(SRCDIR)/frotz_curses.a $(BLORB_LIB)
 	$(CC) $(CFLAGS) $^ -o $@$(EXTENSION) $(CURSES) $(LDFLAGS) $(CURSES_LDFLAGS)
 
-dfrotz:  $(SRCDIR)/frotz_common.a $(DUMB_LIB) $(SRCDIR)/blorblib.a
+dfrotz:  $(SRCDIR)/frotz_common.a $(DUMB_LIB) $(BLORB_LIB)
 	$(CC) $(CFLAGS) $^ -o $@$(EXTENSION)
 
-sfrotz: $(SRCDIR)/frotz_common.a $(SDL_LIB) $(SRCDIR)/blorblib.a
+sfrotz: $(SRCDIR)/frotz_common.a $(SDL_LIB) $(BLORB_LIB)
 	$(CC) $(CFLAGS) $^ -o $@$(EXTENSION) $(LDFLAGS) $(SDL_LDFLAGS)
 
 # Libs
@@ -209,11 +211,15 @@ $(SRCDIR)/frotz_curses.a: $(CURSES_DIR)/defines.h $(CURSES_OBJECT)
 dumb_lib:	$(DUMB_LIB)
 $(DUMB_LIB):
 
+blorb_lib:	$(BLORB_LIB)
+$(BLORB_LIB):
+
 
 #$(SRCDIR)/frotz_dumb.a: $(DUMB_OBJECT)
 
-blorb_lib:	$(SRCDIR)/blorblib.a
-$(SRCDIR)/blorblib.a: $(BLORB_OBJECT)
+#blorb_lib:	$(SRCDIR)/blorblib.a
+#$(SRCDIR)/blorblib.a: $(BLORB_OBJECT)
+
 
 # Defines
 
diff --git a/src/blorb/Makefile b/src/blorb/Makefile
new file mode 100644
index 0000000..c8214a5
--- /dev/null
+++ b/src/blorb/Makefile
@@ -0,0 +1,28 @@
+# For GNU Make.
+
+SOURCES = blorblib.c
+
+HEADERS = blorb.h blorblow.h
+
+OBJECTS = $(SOURCES:.c=.o)
+
+DEPS = $(SOURCES:.c=.d)
+
+TARGET = blorblib.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)