Diff of /Makefile [ba41e6] .. [83b728] Maximize Restore

  Switch to side-by-side view

--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,29 @@
+CFLAGS=-g -Wall -I../libconfig-1.4.8/lib -static
+CC=m68k-uclinux-gcc
+AR=m68k-uclinux-ar
+RANLIB=ranlib
+LIBS=-L./  -L../libconfig-1.4.8/lib/.libs -lcgic -lconfig -static
 
-CC=$(CROSS_COMPILE)gcc
-CFLAGS=-static -g -Wall -fPIC -mcpu=5208 -Os
-INCLUDES=-I$(ROOTDIR)/include -Ilibcgi-1.0/src
-LDFLAGS=-static -g -fPIC -lconfig -lcrypt -lcgi
-LIBRARIES= -L$(ROOTDIR)/lib -Llibcgi-1.0/src
-SOURCES=osoft.c settings.c
-OBJECTS=$(SOURCES:.c=.o)
+all: libcgic.a osoft.cgi capture
 
-all: $(SOURCES) osoft.cgi libcgi
-	
-osoft.cgi: osoft.o settings.o libcgi
-	$(CC) osoft.o settings.o $(LIBRARIES) $(LDFLAGS) -o $@
-	m68k-uclinux-flthdr -s 8192 $@
+install: libcgic.a
+	cp libcgic.a /usr/local/lib
+	cp cgic.h /usr/local/include
+	@echo libcgic.a is in /usr/local/lib. cgic.h is in /usr/local/include.
 
-libcgi:
-	make -C libcgi-1.0 all
+libcgic.a: cgic.o cgic.h
+	rm -f libcgic.a
+	$(AR) rc libcgic.a cgic.o
+	$(RANLIB) libcgic.a
 
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@
+#mingw32 and cygwin users: replace .cgi with .exe
+
+osoft.cgi: osoft.o libcgic.a
+	$(CC) osoft.o -o osoft.cgi ${LIBS}
+
+capture: capture.o libcgic.a
+	$(CC) capture.o -o capture ${LIBS}
 
 clean:
-	rm -rf *.o osoft.cgi osoft.cgi.gdb
-	make -C libcgi-1.0 clean
+	rm -f *.o *.a *.gdb osoft.cgi capture 
 
-romfs: