From: Russ Allbery <rra@debian.org>
Date: Fri, 13 May 2005 01:16:04 +0000 (+0000)
Subject:   * libpam-openafs-kaserver: Fix compilation so that the PAM module isn't
X-Git-Tag: debian/1.3.82-1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5c5a924b1cc46de75387b04df0bf9b14529e52cb;p=packages%2Fo%2Fopenafs.git

  * libpam-openafs-kaserver: Fix compilation so that the PAM module isn't
    missing symbols and therefore unusable.  (Closes: #308844)
---

diff --git a/debian/changelog b/debian/changelog
index 774e59f2e..fd3ba9096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ openafs (1.3.82-1) unstable; urgency=medium
   * Repackage upstream to remove MacOS-specific files covered by the APSL.
     Remove the WINNT directory to save space since we have to repackage
     anyway.  Provide a get-orig-source target to do the repackaging.
+  * libpam-openafs-kaserver: Fix compilation so that the PAM module isn't
+    missing symbols and therefore unusable.  (Closes: #308844)
   * Apply patch from Chas Williams to fix stale cache data from deleted
     files, a bug introduced in 1.3.82.
   * In all cases, only build the module appropriate to the kernel we're
diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index d9f5fe6d2..5ae75da0b 100644
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -51,6 +51,13 @@ KLIBS=${TOP_LIBDIR}/libubik.a \
 OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o 
 KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
 
+PICTARGET =../pic/kauth
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
+$(PICTARGET)/%.o: %.c $(PICTARGET)
+	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+
+$(PICTARGET):
+	mkdir -p $(PICTARGET)
 
 all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb \
 	${TOP_LIBDIR}/libkauth.a \
@@ -63,14 +70,6 @@ depinstall: \
 	${TOP_INCDIR}/afs/kauth.h \
 	${TOP_INCDIR}/afs/kaport.h 
 
-PICTARGET =../pic/kauth
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
 test tests: all
 	cd test; $(MAKE)
 
diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
index 3b6620f7a..b4961f775 100644
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@@ -41,15 +41,15 @@ BASICINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
 LIBS=librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
 	       ${TOP_LIBDIR}/util.a
 
-all: \
-	includes \
-	${TOP_LIBDIR}/librx.a $(PICOBJS)
-
 PICTARGET =../pic/rx
 PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
 $(PICTARGET)/%.o: %.c $(PICTARGET)
 	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
 
+all: \
+	includes \
+	${TOP_LIBDIR}/librx.a $(PICOBJS)
+
 depinstall: includes
 
 $(PICTARGET):
diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index bc056d4d0..9a14d38c5 100644
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -20,8 +20,6 @@ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
      ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \
      ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS}
 
-all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client $(PICOBJS)
-
 PICTARGET =../pic/ubik
 PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
 $(PICTARGET)/%.o: %.c $(PICTARGET)
@@ -156,6 +154,7 @@ clean:
 
 include ../config/Makefile.version
 
+all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client $(PICOBJS)
 
 ${DESTDIR}${libdir}/libubik.a: libubik.a
 	${INSTALL} $? $@