split up into subprojects

sorry anyone who was maintaining patches against this or had hardcoded
paths

Makefile

@@ -1,94 +1,24 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-LFLAGS =
+include Makefile.inc
 
-all:	dos33 asoft_detoken mkdos33fs make_b tokenize_asoft \
-	dos33_text2ascii integer_detoken char2hex pcx2hgr \
-	asoft_presenter	shape_table asoft_compact
+all:
+	cd asoft_basic-utils && make
+	cd asoft_presenter && make
+	cd dos33fs-utils && make
+	cd hgr-utils && make
+
+install:
+	cd asoft_basic-utils && make install
+	cd asoft_presenter && make install
+	cd dos33fs-utils && make install
+	cd hgr-utils && make install
 
 
-asoft_compact:		asoft_compact.o
-			$(CC) $(LFLAGS) -o asoft_compact asoft_compact.o
-
-asoft_compact.o:	asoft_compact.c
-			$(CC) $(CFLAGS) -c asoft_compact.c
-
-asoft_detoken:		asoft_detoken.o
-			$(CC) $(LFLAGS) -o asoft_detoken asoft_detoken.o
-
-asoft_detoken.o:	asoft_detoken.c
-			$(CC) $(CFLAGS) -c asoft_detoken.c
-
-asoft_presenter:	asoft_presenter.o
-			$(CC) $(LFLAGS) -o asoft_presenter asoft_presenter.o
-
-asoft_presenter.o:	asoft_presenter.c
-			$(CC) $(CLFAGS) -c asoft_presenter.c
-
-integer_detoken:	integer_detoken.o
-			$(CC) $(LFLAGS) -o integer_detoken integer_detoken.o
-
-integer_detoken.o:	integer_detoken.c
-			$(CC) $(CFLAGS) -c integer_detoken.c
-
-shape_table:		shape_table.o
-			$(CC) $(LFLAGS) -o shape_table shape_table.o
-
-shape_table.o:		shape_table.c
-			$(CC) $(CFLAGS) -c shape_table.c
-
-tokenize_asoft:		tokenize_asoft.o
-			$(CC) $(LFLAGS) -o tokenize_asoft tokenize_asoft.o
-
-tokenize_asoft.o:	tokenize_asoft.c
-			$(CC) $(CFLAGS) -c tokenize_asoft.c
-
-pcx2hgr:		pcx2hgr.o
-			$(CC) $(LFLAGS) -o pcx2hgr pcx2hgr.o
-
-pcx2hgr.o:		pcx2hgr.c
-			$(CC) $(CFLAGS) -c pcx2hgr.c
-
-char2hex:		char2hex.o
-			$(CC) $(LFLAGS) -o char2hex char2hex.o
-
-char2hex.o:		char2hex.c
-			$(CC) $(CFLAGS) -c char2hex.c
-
-dos33:			dos33.o
-			$(CC) $(LFLAGS) -o dos33 dos33.o
-
-dos33.o:		dos33.c dos33.h
-			$(CC) $(CFLAGS) -c dos33.c
-
-dos33_text2ascii:	dos33_text2ascii.o
-			$(CC) $(LFLGAS) -o dos33_text2ascii dos33_text2ascii.o
-
-dos33_text2ascii.o:	dos33_text2ascii.c
-			$(CC) $(CFLAGS) -c dos33_text2ascii.c
-
-make_b:			make_b.o
-			$(CC) $(LFLAGS) -o make_b make_b.o
-
-make_b.o:		make_b.c
-			$(CC) $(CFLAGS) -c make_b.c
-
-mkdos33fs:		mkdos33fs.o
-			$(CC) $(LFLAGS) -o mkdos33fs mkdos33fs.o
-
-mkdos33fs.o:		mkdos33fs.c dos33.h
-			$(CC) $(CFLAGS) -c mkdos33fs.c
+clean:
+	cd asoft_basic-utils && make clean
+	cd asoft_presenter && make clean
+	cd dos33fs-utils && make clean
+	cd hgr-utils && make clean
+	cd tests && make clean
 
 
-install:	
-		cp dos33 asoft_detoken mkdos33fs tokenize_asoft make_b \
-			dos33_text2ascii integer_detoken /usr/local/bin
-
-clean:		
-		rm -f *~ *.o asoft_detoken dos33 make_b mkdos33fs \
-			tokenize_asoft dos33_text2ascii integer_detoken \
-			char2hex pcx2hgr asoft_presenter shape_table \
-			asoft_compact
-		cd tests && make clean
-		cd presenter_demo && make clean
-
+test:

Makefile.inc

@@ -0,0 +1,6 @@
+CC = gcc
+CFLAGS = -O2 -Wall
+LFLAGS =
+
+INSTALL_LOC = /usr/local/bin
+

asoft_basic-utils/Makefile

@@ -0,0 +1,37 @@
+include ../Makefile.inc
+
+all:	asoft_detoken tokenize_asoft integer_detoken asoft_compact
+
+asoft_compact:		asoft_compact.o
+			$(CC) $(LFLAGS) -o asoft_compact asoft_compact.o
+
+asoft_compact.o:	asoft_compact.c
+			$(CC) $(CFLAGS) -c asoft_compact.c
+
+asoft_detoken:		asoft_detoken.o
+			$(CC) $(LFLAGS) -o asoft_detoken asoft_detoken.o
+
+asoft_detoken.o:	asoft_detoken.c
+			$(CC) $(CFLAGS) -c asoft_detoken.c
+
+integer_detoken:	integer_detoken.o
+			$(CC) $(LFLAGS) -o integer_detoken integer_detoken.o
+
+integer_detoken.o:	integer_detoken.c
+			$(CC) $(CFLAGS) -c integer_detoken.c
+
+tokenize_asoft:		tokenize_asoft.o
+			$(CC) $(LFLAGS) -o tokenize_asoft tokenize_asoft.o
+
+tokenize_asoft.o:	tokenize_asoft.c
+			$(CC) $(CFLAGS) -c tokenize_asoft.c
+
+
+install:	
+		cp asoft_detoken tokenize_asoft integer_detoken $(INSTALL_LOC)
+
+clean:	
+		rm -f *~ *.o asoft_detoken tokenize_asoft \
+			integer_detoken asoft_compact
+
+

asoft_presenter/Makefile

@@ -0,0 +1,20 @@
+include ../Makefile.inc
+
+all:	asoft_presenter
+
+
+asoft_presenter:	asoft_presenter.o
+			$(CC) $(LFLAGS) -o asoft_presenter asoft_presenter.o
+
+asoft_presenter.o:	asoft_presenter.c
+			$(CC) $(CLFAGS) -c asoft_presenter.c
+
+
+install:	
+		cp asoft_presenter $(INSTALL_LOC)
+
+clean:		
+		rm -f *~ *.o asoft_presenter
+
+
+

dos33fs-utils/Makefile

@@ -0,0 +1,42 @@
+include ../Makefile.inc
+
+all:	dos33 mkdos33fs make_b \
+	dos33_text2ascii char2hex
+
+
+char2hex:		char2hex.o
+			$(CC) $(LFLAGS) -o char2hex char2hex.o
+
+char2hex.o:		char2hex.c
+			$(CC) $(CFLAGS) -c char2hex.c
+
+dos33:			dos33.o
+			$(CC) $(LFLAGS) -o dos33 dos33.o
+
+dos33.o:		dos33.c dos33.h
+			$(CC) $(CFLAGS) -c dos33.c
+
+dos33_text2ascii:	dos33_text2ascii.o
+			$(CC) $(LFLGAS) -o dos33_text2ascii dos33_text2ascii.o
+
+dos33_text2ascii.o:	dos33_text2ascii.c
+			$(CC) $(CFLAGS) -c dos33_text2ascii.c
+
+make_b:			make_b.o
+			$(CC) $(LFLAGS) -o make_b make_b.o
+
+make_b.o:		make_b.c
+			$(CC) $(CFLAGS) -c make_b.c
+
+mkdos33fs:		mkdos33fs.o
+			$(CC) $(LFLAGS) -o mkdos33fs mkdos33fs.o
+
+mkdos33fs.o:		mkdos33fs.c dos33.h
+			$(CC) $(CFLAGS) -c mkdos33fs.c
+
+
+install:	
+		cp dos33 mkdos33fs make_b dos33_text2ascii char2hex $(INSTALL_LOC)
+
+clean:		
+		rm -f *~ *.o dos33 mkdos33fs make_b dos33_text2ascii char2hex

dos33fs-utils/version.h

@@ -0,0 +1 @@
+#define VERSION "0.0.10"

hgr-utils/Makefile

@@ -0,0 +1,25 @@
+include ../Makefile.inc
+
+all:	pcx2hgr shape_table
+
+
+shape_table:		shape_table.o
+			$(CC) $(LFLAGS) -o shape_table shape_table.o
+
+shape_table.o:		shape_table.c
+			$(CC) $(CFLAGS) -c shape_table.c
+
+pcx2hgr:		pcx2hgr.o
+			$(CC) $(LFLAGS) -o pcx2hgr pcx2hgr.o
+
+pcx2hgr.o:		pcx2hgr.c
+			$(CC) $(CFLAGS) -c pcx2hgr.c
+
+
+install:	
+		cp pcx2hgr shape_table $(INSTALL_LOC)
+
+clean:		
+		rm -f *~ *.o pcx2hgr shape_table
+
+