[28834] in Source-Commits
moira commit [debian]: Use libtool.
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Wed Apr 25 23:50:05 2018
Date: Wed, 25 Apr 2018 23:49:55 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201804260349.w3Q3ntd7024878@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/moira/commit/d7758cf9909b5da5e350d9357ba7ab1864064f1d
commit d7758cf9909b5da5e350d9357ba7ab1864064f1d
Author: Garry Zacheiss <zacheiss@mit.edu>
Date: Tue May 9 08:02:56 2017 -0400
Use libtool.
moira/webmoira/Makefile.in | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/moira/webmoira/Makefile.in b/moira/webmoira/Makefile.in
index 0a19e68..a0352d7 100644
--- a/moira/webmoira/Makefile.in
+++ b/moira/webmoira/Makefile.in
@@ -9,6 +9,7 @@ JAVA_CPPFLAGS=@JAVA_CPPFLAGS@
CFLAGS=@CFLAGS@
DEFS=@DEFS@
ALL_CFLAGS=$(CPPFLAGS) $(JAVA_CPPFLAGS) $(CFLAGS) $(DEFS)
+LIBTOOL=@LIBTOOL@
LDFLAGS=@LDFLAGS@
SO_LDFLAGS=@SO_LDFLAGS@
LIBS=@LIBS@
@@ -20,6 +21,7 @@ srcdir=@srcdir@
VPATH=@srcdir@
SRCTOP=@top_srcdir@
BUILDTOP=..
+top_builddir=@top_builddir@
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
@@ -32,13 +34,13 @@ JHEADER= mit_moira_MoiraConnectInternal.h
TARGET= $(SOBJ)
-.c.o:
- $(CC) -c $(ALL_CFLAGS) $<
+.c.lo:
+ $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $<
all: $(TARGET)
clean:
- rm -f $(CLASSES) $(OBJ) $(SOBJ) $(SOBJG) $(JHEADER)
+ $(LIBTOOL) --mode=clean rm $(CLASSES) $(OBJ) $(SOBJ) $(SOBJG) $(JHEADER)
cleandir distclean: clean
rm -f Makefile
@@ -46,7 +48,7 @@ cleandir distclean: clean
depend:
$(SOBJ): $(JHEADER) $(OBJ)
- $(CC) $(SO_LDFLAGS) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) $(SO_LDFLAGS) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
cp -p $@ $(SOBJG)
$(JHEADER): java
