[28836] in Source-Commits
moira commit [debian]: More libtool.
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Wed Apr 25 23:50:07 2018
Date: Wed, 25 Apr 2018 23:49:55 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201804260349.w3Q3ntqk024894@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/moira/commit/0a2da1811cf4fcd21fcfd1d24ca7840de0b746b6
commit 0a2da1811cf4fcd21fcfd1d24ca7840de0b746b6
Author: Garry Zacheiss <zacheiss@mit.edu>
Date: Tue May 9 08:17:10 2017 -0400
More libtool.
moira/webmoira/Makefile.in | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/moira/webmoira/Makefile.in b/moira/webmoira/Makefile.in
index a0352d7..625b201 100644
--- a/moira/webmoira/Makefile.in
+++ b/moira/webmoira/Makefile.in
@@ -25,17 +25,20 @@ top_builddir=@top_builddir@
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
CLASSES= mit/moira/AuthenticationError.class mit/moira/Coder.class mit/moira/Delmember.class mit/moira/Kticket.class mit/moira/ListInfo.class mit/moira/Member.class mit/moira/Moira.class mit/moira/MoiraConnectInternal.class mit/moira/MoiraException.class mit/moira/MoiraServlet.class
-OBJ= moirai.o
-SOBJ= mit/moira/libmoirajava.so
-SOBJG= mit/moira/libmoirajava_g.so
+OBJ= moirai.lo
+SOBJ= mit/moira/libmoirajava.la
JHEADER= mit_moira_MoiraConnectInternal.h
TARGET= $(SOBJ)
.c.lo:
- $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $<
+ $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $<
+
+.SUFFIXES: .lo
all: $(TARGET)
@@ -48,8 +51,7 @@ cleandir distclean: clean
depend:
$(SOBJ): $(JHEADER) $(OBJ)
- $(LIBTOOL) --mode=link $(CC) $(SO_LDFLAGS) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
- cp -p $@ $(SOBJG)
+ $(LIBTOOL) --mode=link $(CC) $(SO_LDFLAGS) -o $@ $(LDFLAGS) $(OBJ) $(LIBS) -rpath ${libdir} -version-info 0:0:0
$(JHEADER): java
javah -jni mit.moira.MoiraConnectInternal
