[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[MiNT] 'lib' patches

To: MiNT Mailing List <mint@lists.fishpool.fi>
Subject: [MiNT] 'lib' patches
From: Miro Kropacek <miro.kropacek@gmail.com>
Date: Tue, 5 Jan 2010 23:01:23 +0100
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=/SIo9uKUtl49UD1hD5nSz00jLQC6Unvv7SLZ9Sqk1Oc=; b=VfvKuaeek9jRSyDEchtDrMGy18pn20Prqn1k1QkFiU9zjRDcncHzW/PfwRxABAelYW E4sK7mmwdVq6o1PbiyYHBTMS0RKWZTPfsYcYHz3tcAmNy++9SgJ6Qv9UgYmeAfT4CpTK T/MWV7E5hI6lUDwfUk4NTQk1lPHKBtB3cPTBA=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=XhaiHUUB9rYI1nJWQCGt2E2iZDiC5AgWhG9T6JZW6Gt/DqUWhUu1q2WvYnqfmS8jIU 1ONYj8hLVNZVJCX5Hm4ySv+XJRBjjbb4L5NxWKwpdTTNksGIm3+0UVNhvlcfa7j6ccHM LalcxO9QfiC7LIfV4TMk+cQfnSSS+aIs5SfCk=
List-help: <mailto:ecartis@lists.fishpool.fi?Subject=help>
List-id: <mint.lists.fishpool.fi>
List-owner: <mailto:tjhukkan@fishpool.fi>
List-post: <mailto:mint@lists.fishpool.fi>
List-subscribe: <mailto:mint-request@lists.fishpool.fi?Subject=subscribe>
List-unsubscribe: <mailto:mint-request@lists.fishpool.fi?Subject=unsubscribe>
Sender: mint-bounce@lists.fishpool.fi

Hi,

here are some cosmetic patches for 'lib' module -- I added 020+ support for cflib, made it configurable with WITH_020_LIB macro and fixed some install/uninstall names.

If someone could commit, I'd thankful :)

--
MiKRO / Mystic Bytes
http://mikro.atari.org

? lib.patch
? gemma/configtool/.deps
? gemma/configtool/gemma.app
? gemma/src/gemma32.slb
? gemma/test/.deps
? gemma/test/test.app
Index: cflib/Makefile
===================================================================
RCS file: /mint/lib/cflib/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- cflib/Makefile	17 May 2004 08:28:31 -0000	1.4
+++ cflib/Makefile	5 Jan 2010 21:53:06 -0000
@@ -23,14 +23,22 @@
 # default definitions
 GENFILES = .lib* libcflib*.a
 
+ALL_LIBS = normal mshort
 
-libs: normal mshort
+ifeq ($(WITH_020_LIB),yes)
+ALL_LIBS += normal020
+endif
+
+libs: $(ALL_LIBS)
 
 normal:
 	$(MAKE) libcflib.a TARGET=""
 
 mshort:
 	$(MAKE) libcflib16.a TARGET="16"
+	
+normal020:
+	$(MAKE) libcflib020.a TARGET="020"
 
 libcflib$(TARGET).a: objs
 	$(RM) $@
@@ -56,7 +64,11 @@
 install:
 	install -m 644 cflib.h        ${PREFIX}/include
 	install -m 644 libcflib.a     ${PREFIX}/lib
-	install -m 644 libcflib16.a   ${PREFIX}/lib
+	install -m 644 libcflib16.a   ${PREFIX}/lib/mshort/libcflib.a
+	ln -s mshort/libcflib.a	      ${PREFIX}/lib/libcflib16.a
+ifeq ($(WITH_020_LIB),yes)
+	install -m 644 libcflib020.a  ${PREFIX}/lib/m68020-60/libcflib.a
+endif
 	install -m 644 cflib.hyp      ${PREFIX}/stguide
 	install -m 644 cflib.ref      ${PREFIX}/stguide
 
@@ -64,6 +76,9 @@
 	rm -f ${PREFIX}/include/cflib.h
 	rm -f ${PREFIX}/lib/libcflib.a
 	rm -f ${PREFIX}/lib/libcflib16.a
+	rm -f ${PREFIX}/lib/mshort/libcflib.a
+ifeq ($(WITH_020_LIB),yes)
+	rm -f ${PREFIX}/lib/m68020-60/libcflib.a
+endif
 	rm -f ${PREFIX}/stguide/cflib.hyp
 	rm -f ${PREFIX}/stguide/cflib.ref
-
Index: cflib/Makefile.objs
===================================================================
RCS file: /mint/lib/cflib/Makefile.objs,v
retrieving revision 1.6
diff -u -r1.6 Makefile.objs
--- cflib/Makefile.objs	8 Jul 2009 20:06:26 -0000	1.6
+++ cflib/Makefile.objs	5 Jan 2010 21:53:06 -0000
@@ -25,6 +25,10 @@
 GENERAL += -mshort
 endif
 
+ifeq ($(TARGET),020)
+GENERAL += -m68020-60
+endif
+
 # default definitions
 OBJS = $(COBJS:.c=.o) $(SOBJS:.s=.o)
 
Index: gemlib/Makefile
===================================================================
RCS file: /mint/lib/gemlib/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- gemlib/Makefile	21 Dec 2009 09:39:33 -0000	1.16
+++ gemlib/Makefile	5 Jan 2010 21:53:06 -0000
@@ -168,8 +168,16 @@
 uninstall:
 	rm -f $(PREFIX)/lib/libgem.a
 	rm -f $(PREFIX)/lib/libgem16.a
+	rm -f $(PREFIX)/lib/mshort/libgem.a
+ifeq ($(WITH_020_LIB),yes)
+	rm -f $(PREFIX)/lib/m68020-60/libgem.a
+	rm -f $(PREFIX)/lib/m68020-60/mshort/libgem.a
+endif
+ifeq ($(WITH_V4E_LIB),yes)
+	rm -f $(PREFIX)/lib/m5475/libgem.a
+	rm -f $(PREFIX)/lib/m5475/mshort/libgem.a
+endif
 	rm -f $(PREFIX)/include/gem.h
 	rm -f $(PREFIX)/include/gemx.h
 	rm -f $(PREFIX)/include/mt_gem.h
 	rm -f $(PREFIX)/include/mt_gemx.h
-
Index: gemma/Makefile
===================================================================
RCS file: /mint/lib/gemma/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- gemma/Makefile	6 Jan 2004 08:20:31 -0000	1.6
+++ gemma/Makefile	5 Jan 2010 21:53:06 -0000
@@ -30,7 +30,9 @@
 	install -m 644 include/slb/gemma-struct.h ${PREFIX}/include/slb
 	install -m 644 include/slb/kernel.h ${PREFIX}/include/slb
 	install -m 644 libgemma/libgemma.a ${PREFIX}/lib
-	install -m 644 libgemma/libgemma020.a ${PREFIX}/lib/m68020-60
+ifeq ($(WITH_020_LIB),yes)
+	install -m 644 libgemma/libgemma020.a ${PREFIX}/lib/m68020-60/libgemma.a
+endif
 	install -m 755 src/gemma32.slb ${PREFIX}/local/lib/slb
 	install -m 755 kernel32.slb ${PREFIX}/local/lib/slb
 
@@ -39,6 +41,8 @@
 	rm -f ${PREFIX}/include/slb/gemma.h
 	rm -f ${PREFIX}/include/slb/kernel.h
 	rm -f ${PREFIX}/lib/libgemma.a
-	rm -f ${PREFIX}/lib/m68020-60/libgemma020.a
+ifeq ($(WITH_020_LIB),yes)
+	rm -f ${PREFIX}/lib/m68020-60/libgemma.a
+endif
 	rm -f ${PREFIX}/local/lib/slb/gemma32.slb
 	rm -f ${PREFIX}/local/lib/slb/kernel32.slb
Index: gemma/libgemma/Makefile
===================================================================
RCS file: /mint/lib/gemma/libgemma/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- gemma/libgemma/Makefile	10 Feb 2002 18:45:07 -0000	1.2
+++ gemma/libgemma/Makefile	5 Jan 2010 21:53:06 -0000
@@ -22,8 +22,13 @@
 # default definitions
 GENFILES = .lib* libgem*.a
 
+ALL_LIBS = normal
 
-libs: normal normal020
+ifeq ($(WITH_020_LIB),yes)
+ALL_LIBS += normal020
+endif
+
+libs: $(ALL_LIBS)
 
 normal:
 	$(MAKE) libgemma.a TARGET=""

Follow-Ups:
- Re: [MiNT] 'lib' patches
  - From: Alan Hourihane <alanh@fairlite.co.uk>

Prev by Date: Re: [MiNT] File sizes
Next by Date: Re: [MiNT] Problem with xaaes/nvdi+video card
Previous by thread: Re: [MiNT] New branches !
Next by thread: Re: [MiNT] 'lib' patches
Index(es):
- Date
- Thread