summaryrefslogtreecommitdiff
path: root/wm/afterstep/patches/patch-ah
blob: f60b1aec89fd968c00488787de8984f235850fe5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
$NetBSD: patch-ah,v 1.2 2001/03/11 19:59:00 fredb Exp $

--- autoconf/Makefile.common.lib.in.orig	Fri Oct 20 06:27:57 2000
+++ autoconf/Makefile.common.lib.in	Sun Mar 11 15:16:36 2001
@@ -4,7 +4,7 @@
 
 @MAKEFILEDEFINES@
 
-all:            @LIBPROG@ $(INSTALLONBUILD)
+all:            @LIBPROG@
 
 install.bin:
 
@@ -15,24 +15,7 @@
 install.script:
 
 install.dyn:
-		$(INSTALL_LIB) $(DYNPROG).$(LIBVER) $(LIBDIR)
-		-@/bin/rm -f $(LIBDIR)/$(DYNPROG).$(LIBVERMAJOR) $(LIBDIR)/$(DYNPROG)
-		ln -sf $(DYNPROG).$(LIBVER) $(LIBDIR)/$(DYNPROG).$(LIBVERMAJOR)
-		ln -sf $(DYNPROG).$(LIBVERMAJOR) $(LIBDIR)/$(DYNPROG)
-		@( \
-		 if test `uname` = "Linux"; then \
-		   if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
-		     echo "" > /dev/null; \
-		   elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \
-		     echo "" > /dev/null; \
-		   else \
-		     echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \
-		     echo "$(DYNPROG), you may need to add it or set LD_LIBRARY_PATH."; \
-		   fi; \
-		   echo "ldconfig"; \
-		   ldconfig; \
-		 fi \
-		)
+		$(LIBTOOL) --mode=install $(INSTALL_LIB) $(PROG) $(LIBDIR)/$(PROG:.la=.so).$(LIBVERMAJOR).$(LIBVERMINOR)
 
 uninstall.bin:
 
@@ -80,12 +63,10 @@
 		fi
 
 $(PROG):	$(OBJS)
-		$(RMF) $(PROG)
-		$(AR) $(PROG) $(OBJS)
-		$(RANLIB) $(PROG)
+		$(LIBTOOL) --mode=link $(CC) $(LDSTATIC) $(OBJS:.o=.lo) -rpath $(LIBDIR) -version-info $(LIBVERMAJOR):$(LIBVERMINOR) -o $(@)
 
 .c.o:
-		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
+		$(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
 
 #
 # include dependency files if they exist
@@ -95,14 +76,4 @@
 #ifneq ($(wildcard .depend),)
 include .depend
 #endif
-
-$(DYNPROG): $(DYNPROG).$(LIBVERMAJOR)
-	ln -sf $(DYNPROG).$(LIBVERMAJOR) $(DYNPROG)
-
-$(DYNPROG).$(LIBVERMAJOR): $(DYNPROG).$(LIBVER)
-	ln -sf $(DYNPROG).$(LIBVER) $(DYNPROG).$(LIBVERMAJOR)
-
-$(DYNPROG).$(LIBVER): $(OBJSDLL)
-	$(CC) -shared -Wl,-soname,$(DYNPROG).$(LIBVERMAJOR) -o $(DYNPROG).$(LIBVER) \
-	 $(OBJSDLL)