Prepare for libtool-2.2: explicitly use --tag.
This commit is contained in:
parent
cc367920d1
commit
0c36d719b8
5 changed files with 15 additions and 15 deletions
|
@ -1,13 +1,13 @@
|
||||||
$NetBSD: distinfo,v 1.4 2006/04/28 18:24:53 joerg Exp $
|
$NetBSD: distinfo,v 1.5 2009/11/26 16:48:26 joerg Exp $
|
||||||
|
|
||||||
SHA1 (gcin-1.1.7.tar.bz2) = 0dd2cf64703d276fca3e5492e4ad1aaaed6fe290
|
SHA1 (gcin-1.1.7.tar.bz2) = 0dd2cf64703d276fca3e5492e4ad1aaaed6fe290
|
||||||
RMD160 (gcin-1.1.7.tar.bz2) = 2c89f8a879e2ada52fb576bb6f91ac83e909a675
|
RMD160 (gcin-1.1.7.tar.bz2) = 2c89f8a879e2ada52fb576bb6f91ac83e909a675
|
||||||
Size (gcin-1.1.7.tar.bz2) = 1392767 bytes
|
Size (gcin-1.1.7.tar.bz2) = 1392767 bytes
|
||||||
SHA1 (patch-aa) = 4c7c53caf655b3d9c2ea6132593aebf81457918b
|
SHA1 (patch-aa) = 4c7c53caf655b3d9c2ea6132593aebf81457918b
|
||||||
SHA1 (patch-ab) = d503fd73da6485bb4709f3bee43ab66ca65e8bd8
|
SHA1 (patch-ab) = 2aa3dda5a55a591e4cb36b4b28da254eb8873585
|
||||||
SHA1 (patch-ac) = 45c8bf6d7fe855f92ed7aa15064d0d58070fa588
|
SHA1 (patch-ac) = 2722d0b0f099644e2fd305339b869d574b0aa854
|
||||||
SHA1 (patch-ad) = b8784d2c6665b98a48db6e5059bf0029682536fe
|
SHA1 (patch-ad) = 961b0a597a5f6ee6fac4bbd4873616471e295c26
|
||||||
SHA1 (patch-ae) = 308618a970a4cbd66f89ae2a2a64b35c600cddab
|
SHA1 (patch-ae) = f7718fbb9a6a788a51c0d4198e2ba67048e59315
|
||||||
SHA1 (patch-af) = e66965a840e67afe007c4ddaa55cba572cf49e6f
|
SHA1 (patch-af) = e66965a840e67afe007c4ddaa55cba572cf49e6f
|
||||||
SHA1 (patch-ag) = d3e16fd690f132bd687ceda2d13041e447147f6e
|
SHA1 (patch-ag) = d3e16fd690f132bd687ceda2d13041e447147f6e
|
||||||
SHA1 (patch-ah) = 9edfc9e2df42fe0f9b7817a679b5727a86571fe4
|
SHA1 (patch-ah) = 9edfc9e2df42fe0f9b7817a679b5727a86571fe4
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
$NetBSD: patch-ab,v 1.2 2006/02/22 14:55:54 rxg Exp $
|
$NetBSD: patch-ab,v 1.3 2009/11/26 16:48:26 joerg Exp $
|
||||||
|
|
||||||
--- Makefile.orig 2006-02-16 17:36:08.000000000 +0800
|
--- Makefile.orig 2006-02-16 17:36:08.000000000 +0800
|
||||||
+++ Makefile
|
+++ Makefile
|
||||||
|
@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2006/02/22 14:55:54 rxg Exp $
|
||||||
-.c.E:
|
-.c.E:
|
||||||
- $(CC) $(CFLAGS) -E -o $@ $<
|
- $(CC) $(CFLAGS) -E -o $@ $<
|
||||||
+.c.o:
|
+.c.o:
|
||||||
+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -o $@ $<
|
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
PROGS=gcin tsd2a tsa2d phoa2d phod2a tslearn gcin-setup gcin2tab juyin-learn sim2trad
|
PROGS=gcin tsd2a tsa2d phoa2d phod2a tslearn gcin-setup gcin2tab juyin-learn sim2trad
|
||||||
PROGS_CV=kbmcv
|
PROGS_CV=kbmcv
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
$NetBSD: patch-ac,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $
|
$NetBSD: patch-ac,v 1.2 2009/11/26 16:48:26 joerg Exp $
|
||||||
|
|
||||||
--- im-srv/Makefile.orig 2006-01-14 23:40:15.000000000 +0800
|
--- im-srv/Makefile.orig 2006-01-14 23:40:15.000000000 +0800
|
||||||
+++ im-srv/Makefile
|
+++ im-srv/Makefile
|
||||||
|
@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $
|
||||||
OBJS = im-srv.o im-addr.o im-dispatch.o ../im-client/gcin-crypt.o
|
OBJS = im-srv.o im-addr.o im-dispatch.o ../im-client/gcin-crypt.o
|
||||||
|
|
||||||
+.c.o:
|
+.c.o:
|
||||||
+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -o $@ $<
|
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $<
|
||||||
+
|
+
|
||||||
im-srv.a: $(OBJS)
|
im-srv.a: $(OBJS)
|
||||||
ar cr $@ $(OBJS)
|
ar cr $@ $(OBJS)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
$NetBSD: patch-ad,v 1.3 2006/02/22 14:55:54 rxg Exp $
|
$NetBSD: patch-ad,v 1.4 2009/11/26 16:48:26 joerg Exp $
|
||||||
|
|
||||||
--- im-client/Makefile.orig 2006-02-16 18:23:34.000000000 +0800
|
--- im-client/Makefile.orig 2006-02-16 18:23:34.000000000 +0800
|
||||||
+++ im-client/Makefile
|
+++ im-client/Makefile
|
||||||
|
@ -19,12 +19,12 @@ $NetBSD: patch-ad,v 1.3 2006/02/22 14:55:54 rxg Exp $
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
- $(CC) -c -fpic $(CFLAGS) -o $@ $<
|
- $(CC) -c -fpic $(CFLAGS) -o $@ $<
|
||||||
+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -o $@ $<
|
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
-libgcin-im-client.so: $(OBJS)
|
-libgcin-im-client.so: $(OBJS)
|
||||||
- $(CC) -shared $(OBJS) -o $@
|
- $(CC) -shared $(OBJS) -o $@
|
||||||
+libgcin-im-client.la: $(OBJS)
|
+libgcin-im-client.la: $(OBJS)
|
||||||
+ $(LIBTOOL) --mode=link $(CC) $(OBJS:.o=.lo) -o $@ -rpath $(libdir) -version-info 1:1
|
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(OBJS:.o=.lo) -o $@ -rpath $(libdir) -version-info 1:1
|
||||||
$(MAKE) -C ../gtk-im
|
$(MAKE) -C ../gtk-im
|
||||||
|
|
||||||
LOCALLIB=/usr/local/$(LIB)
|
LOCALLIB=/usr/local/$(LIB)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
$NetBSD: patch-ae,v 1.3 2006/02/22 14:55:54 rxg Exp $
|
$NetBSD: patch-ae,v 1.4 2009/11/26 16:48:26 joerg Exp $
|
||||||
|
|
||||||
--- gtk-im/Makefile.orig 2006-02-22 21:11:46.000000000 +0800
|
--- gtk-im/Makefile.orig 2006-02-22 21:11:46.000000000 +0800
|
||||||
+++ gtk-im/Makefile
|
+++ gtk-im/Makefile
|
||||||
|
@ -15,12 +15,12 @@ $NetBSD: patch-ae,v 1.3 2006/02/22 14:55:54 rxg Exp $
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
- $(CC) -c -fpic $(CFLAGS) -o $@ $<
|
- $(CC) -c -fpic $(CFLAGS) -o $@ $<
|
||||||
+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -o $@ $<
|
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
-im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so
|
-im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so
|
||||||
- $(CC) -shared $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
|
- $(CC) -shared $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
|
||||||
+im-gcin.la: $(OBJS) ../im-client/libgcin-im-client.la
|
+im-gcin.la: $(OBJS) ../im-client/libgcin-im-client.la
|
||||||
+ $(LIBTOOL) --mode=link $(CC) $(OBJS:.o=.lo) ../im-client/libgcin-im-client.la -o $@ $(LDFLAGS) -rpath $(IMMODULES) -module -avoid-version
|
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(OBJS:.o=.lo) ../im-client/libgcin-im-client.la -o $@ $(LDFLAGS) -rpath $(IMMODULES) -module -avoid-version
|
||||||
rm -f core.*
|
rm -f core.*
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
Loading…
Reference in a new issue