| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | $NetBSD: patch-aa,v 1.6 2009/09/09 17:16:36 joerg Exp $ | | 1 | $NetBSD: patch-aa,v 1.7 2017/07/07 11:19:44 wiz Exp $ |
2 | | | 2 | |
3 | --- uulib/Makefile.in.orig 2002-03-11 03:15:46.000000000 -0600 | | 3 | --- uulib/Makefile.in.orig 2002-03-11 03:15:46.000000000 -0600 |
4 | +++ uulib/Makefile.in | | 4 | +++ uulib/Makefile.in |
5 | @@ -19,7 +19,7 @@ SHELL = /bin/sh | | 5 | @@ -19,7 +19,7 @@ SHELL = /bin/sh |
6 | # | | 6 | # |
7 | # If you don't have the GNU C compiler installed, set CC=cc here | | 7 | # If you don't have the GNU C compiler installed, set CC=cc here |
8 | # | | 8 | # |
9 | -CC = @CC@ | | 9 | -CC = @CC@ |
10 | +CC = $(LIBTOOL) --mode=compile @CC@ | | 10 | +CC = $(LIBTOOL) --mode=compile @CC@ |
11 | # | | 11 | # |
12 | # C Compiler Options | | 12 | # C Compiler Options |
13 | # | | 13 | # |
14 | @@ -51,11 +51,11 @@ UULIB_OBJ = ${UULIB_SOURCE:.c=.o} | | 14 | @@ -51,11 +51,11 @@ UULIB_OBJ = ${UULIB_SOURCE:.c=.o} |
| @@ -28,18 +28,18 @@ $NetBSD: patch-aa,v 1.6 2009/09/09 17:16 | | | @@ -28,18 +28,18 @@ $NetBSD: patch-aa,v 1.6 2009/09/09 17:16 |
28 | @@ -64,13 +64,13 @@ distclean: clean | | 28 | @@ -64,13 +64,13 @@ distclean: clean |
29 | realclean: distclean | | 29 | realclean: distclean |
30 | | | 30 | |
31 | new: clean | | 31 | new: clean |
32 | - rm -f libuu.a | | 32 | - rm -f libuu.a |
33 | + rm -f libuu.la | | 33 | + rm -f libuu.la |
34 | $(MAKE) all | | 34 | $(MAKE) all |
35 | | | 35 | |
36 | -libuu.a: $(UULIB_OBJ) | | 36 | -libuu.a: $(UULIB_OBJ) |
37 | +libuu.la: $(UULIB_OBJ) | | 37 | +libuu.la: $(UULIB_OBJ) |
38 | rm -f $@ | | 38 | rm -f $@ |
39 | - ar r $@ $(UULIB_OBJ) | | 39 | - ar r $@ $(UULIB_OBJ) |
40 | - -$(RANLIB) $@ | | 40 | - -$(RANLIB) $@ |
41 | + $(LIBTOOL) --mode=link @CC@ -o libuu.la $(UULIB_OBJ:.o=.lo) -rpath $(PREFIX)/lib \ | | 41 | + $(LIBTOOL) --mode=link @CC@ $(LDFLAGS) -o libuu.la $(UULIB_OBJ:.o=.lo) -rpath $(PREFIX)/lib \ |
42 | + -version-info 2:0 | | 42 | + -version-info 2:0 |
43 | | | 43 | |
44 | .c.o: | | 44 | .c.o: |
45 | $(CC) -c $(CFLAGS) $(VDEF) $< | | 45 | $(CC) -c $(CFLAGS) $(VDEF) $< |