[Expat-checkins] expat/amiga Makefile,1.5,1.6 README.txt,1.4,1.5

[Steven Solie]

Update of /cvsroot/expat/expat/amiga
In directory sc8-pr-cvs17:/tmp/cvs-serv1307

Modified Files:
	Makefile README.txt 
Log Message:
Updated for latest SDK.

Index: Makefile
===================================================================
RCS file: /cvsroot/expat/expat/amiga/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	19 Mar 2006 04:45:43 -0000	1.5
+++ Makefile	3 Jun 2007 14:58:37 -0000	1.6
@@ -37,15 +37,15 @@
 help:
 	@echo "Requires:"
 	@echo " AmigaOS 4.0"
-	@echo " SDK 51.15"
-	@echo " clib2 1.198"
+	@echo " SDK 51.22"
+	@echo " clib2 1.202"
 	@echo ""
 	@echo "Targets:"
 	@echo " all - make expat libraries, xmlwf, examples and run test suite"
 	@echo " install - install expat libraries and tools into SDK"
 
 all:
-	-makedir lib libs
+	-makedir force lib libs
 	$(MAKE) staticlib
 	$(MAKE) sharedlib
 
@@ -63,7 +63,7 @@
 	-delete libs/#?.o quiet
 
 install:
-	copy lib/xmlwf $(tooldir) quiet
+	copy libs/xmlwf $(tooldir) quiet
 	copy /lib/expat.h /lib/expat_external.h $(staticincludedir) quiet
 	copy lib/libexpat.a $(staticlibdir) quiet
 	copy libs/expat.library $(sharedlibdir) quiet
@@ -82,12 +82,15 @@
 LAUNCH =
 
 ifeq ($(MAKECMDGOALS), staticlib)
+ CFLAGS += -mcrt=clib2
+ LDFLAGS += -mcrt=clib2
  LIBS += $(STATICLIB)
  INCLUDES = -I../lib
 endif
 
 ifeq ($(MAKECMDGOALS), sharedlib)
- CFLAGS += -DAMIGA_SHARED_LIB -D__USE_INLINE__
+ CFLAGS += -mcrt=newlib -D__USE_INLINE__
+ LDFLAGS += -mcrt=newlib
  INCLUDES = -I. -Iinclude -Iinclude/libraries -I../lib
  LAUNCH = $(DESTDIR)/launch.o
 endif

Index: README.txt
===================================================================
RCS file: /cvsroot/expat/expat/amiga/README.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- README.txt	19 Mar 2006 04:34:35 -0000	1.4
+++ README.txt	3 Jun 2007 14:58:37 -0000	1.5
@@ -14,6 +14,13 @@
 
 HISTORY
 =======
+4.2  - updated to correspond to Expat 2.0.1 release
+     - bumped copyright banners and versions
+     - simplified amigaconfig.h
+     - updated include/libraries/expat.h file
+     - modified launch.c to use contructor/deconstructor
+     - removed need for amiga_main() from expat utilities
+
 4.1  - fixed memory freeing bug in shared library version
      - now allocates shared memory