From 53b025cd20947c189fda0dfef25bd033cc0b4578 Mon Sep 17 00:00:00 2001
From: Laurent Vivier <Laurent@lvivier.info>
Date: Sat, 26 Nov 2005 08:53:39 +0000
Subject: [PATCH]  create libstream in hard/ and floppy/

---
 libstream/Makefile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/libstream/Makefile b/libstream/Makefile
index 4b425e4..45f75d3 100644
--- a/libstream/Makefile
+++ b/libstream/Makefile
@@ -5,12 +5,10 @@
 TOP = $(shell pwd)
 VPATH=$(TOP)
 
-CFLAGS	= -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -g
-CPPFLAGS = -I$(TOP)/../libfloppy -I$(TOP)/../libscsi -I$(TOP)/../libblock \
-	   -I$(TOP)/../libblock -I$(TOP)/../libiso9660 -I$(TOP)/../libmacos \
-	   -I$(TOP)/../libcontainer -I$(TOP) -I$(TOP)/../libgzip
+CFLAGS	= -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -g -O2
+CPPFLAGS = -I$(TOP)/../libmacos -I$(TOP) -I$(TOP)/../libgzip
 
-LIBRARY = libstream.a
+LIBRARIES = hard/libstream.a floppy/libstream.a
 
 SOURCES = stream_close.c stream_open.c stream_read.c stream_lseek.c \
 	  stream_uncompress.c gzio.c stream_fstat.c
@@ -19,6 +17,14 @@ HEADERS = libstream.h
 
 DISTFILES = $(SOURCES) $(HEADERS)
 
-all: $(LIBRARY)
+all: $(LIBRARIES)
+
+hard/libstream.a::
+	test -e hard || mkdir hard
+	$(MAKE) -C hard -f $(TOP)/Makefile TOP=$(TOP) LIBRARY=libstream.a CPPFLAGS="$(CPPFLAGS) -DSCSI_SUPPORT -DISO9660_SUPPORT -I$(TOP)/../libscsi -I$(TOP)/../libiso9660" libstream.a
+
+floppy/libstream.a::
+	test -e floppy || mkdir floppy
+	$(MAKE) -C floppy -f $(TOP)/Makefile TOP=$(TOP) LIBRARY=libstream.a CPPFLAGS="$(CPPFLAGS) -DFLOPPY_SUPPORT -DBLOCK_SUPPORT -I$(TOP)/../libfloppy -I$(TOP)/../libblock" libstream.a
 
 include $(TOP)/../Rules.mk