svn commit: lorikeet r614 - in trunk/heimdal/lib/auth/pam: .
lha at samba.org
lha at samba.org
Fri Oct 20 21:24:47 GMT 2006
Author: lha
Date: 2006-10-20 21:24:47 +0000 (Fri, 20 Oct 2006)
New Revision: 614
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=614
Log:
Minimize diff to Heimdal.
Modified:
trunk/heimdal/lib/auth/pam/Makefile.am
Changeset:
Modified: trunk/heimdal/lib/auth/pam/Makefile.am
===================================================================
--- trunk/heimdal/lib/auth/pam/Makefile.am 2006-10-20 21:22:42 UTC (rev 613)
+++ trunk/heimdal/lib/auth/pam/Makefile.am 2006-10-20 21:24:47 UTC (rev 614)
@@ -46,11 +46,11 @@
pam_krb4.so: $(OBJS)
@if test -f $(top_builddir)/lib/krb/.libs/libkrb.a; then \
- echo "$(CC) -shared -o $@ $(LDFLAGS) $(OBJS) $(L)"; \
- $(CC) -shared -o $@ $(LDFLAGS) $(OBJS) $(L); \
+ echo "$(LIBTOOL) --mode=link --tag=CC $(CC) -shared -o $@ $(LDFLAGS) $(OBJS) $(L)"; \
+ $(LIBTOOL) --mode=link --tag=CC $(CC) -shared -o $@ $(LDFLAGS) $(OBJS) $(L); \
elif test -f $(top_builddir)/lib/krb/.libs/libkrb.so; then \
- echo "$(CC) -shared -o $@ $(LDFLAGS) $(OBJS) $(L_shared)"; \
- $(CC) -shared -o $@ $(LDFLAGS) $(OBJS) $(L_shared); \
+ echo "$(LIBTOOL) --mode=link --tag=CC $(CC) -shared -o $@ $(LDFLAGS) $(OBJS) $(L_shared)"; \
+ $(LIBTOOL) --mode=link --tag=CC $(CC) -shared -o $@ $(LDFLAGS) $(OBJS) $(L_shared); \
else \
echo "missing libraries"; exit 1; \
fi
@@ -62,6 +62,7 @@
# XXX inline COMPILE since automake wont add it
.c.o:
- $(CC) $(DEFS) $(DEFAULT_AM_CPPFLAGS) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) \
+ $(DEFS) $(DEFAULT_AM_CPPFLAGS) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-c `test -f '$<' || echo '$(srcdir)/'`$<
More information about the samba-cvs
mailing list