Fix libpam-openafs-kaserver

diff --git a/debian/changelog b/debian/changelog
index fb95b37aa1c792db0bd29a44aef777b02841235a..8175cefe0c701197681d20f6fd865f9e7a9c2d87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ openafs (1.2.10-2) unstable; urgency=low
   * Fix wording of question about using dynroot, Closes: #209332
   * New French debconf translations, sorry about the delay in including these, Closes: #203608
   * Avoid yes/no construction in openafs-client templates, Closes: #198476
+  * Fix libpam-openafs-kaserver to include the symbols it needs, patch
+    from Daniel Joseph Barnhart Clark , Closes: #194818
 
- --
+ -- Sam Hartman <hartmans@debian.org>  Mon, 13 Oct 2003 00:38:42 -0400
 
 openafs (1.2.10-1) unstable; urgency=low
 

diff --git a/debian/patch.build_pam2 b/debian/patch.build_pam2
new file mode 100644 (file)
index 0000000..1386e2b
--- /dev/null
+++ b/debian/patch.build_pam2
@@ -0,0 +1,200 @@
+? src/pic
+? src/shlibafsauthent/Makefile
+? src/shlibafsrpc/Makefile
+? src/tests/Makefile
+? src/tests/run-tests
+? src/tests/OpenAFS/Dirpath.pm
+Index: src/pam/Makefile.in
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/pam/Makefile.in,v
+retrieving revision 1.13
+diff -u -r1.13 Makefile.in
+--- src/pam/Makefile.in        30 Jul 2003 17:23:45 -0000      1.13
++++ src/pam/Makefile.in        13 Oct 2003 04:23:02 -0000
+@@ -76,7 +76,7 @@
+               $(LD) $(LDFLAGS) -M mapfile -o $@ afs_setcred.o afs_auth.o afs_util.o\
+                       $(SHOBJS) $(LIBS) ;; \
+       *linux*) \
+-              $(CC) $(LDFLAGS) $(PAM_CFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS)  `find ../pic/ -name "*.o" | grep -v AFS_compo`  -lpam;;\
++              $(CC) $(LDFLAGS) $(PAM_CFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS)  `find ../pic/ -name "*.o" | grep -v AFS_compo`  -lpam -lresolv;;\
+       *fbsd*) \
+               $(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
+       * ) \
+Index: src/ptserver/Makefile.in
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/ptserver/Makefile.in,v
+retrieving revision 1.1.1.3
+diff -u -r1.1.1.3 Makefile.in
+--- src/ptserver/Makefile.in   30 Jul 2003 17:12:41 -0000      1.1.1.3
++++ src/ptserver/Makefile.in   13 Oct 2003 04:23:02 -0000
+@@ -59,8 +59,18 @@
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libsys.a
+ 
++LIBOBJS = ptuser.o pterror.o ptint.cs.o ptint.xdr.o 
+ 
+-all: ukinstall ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a ${TOP_INCDIR}/afs/prclient.h ${TOP_INCDIR}/afs/prerror.h ${TOP_INCDIR}/afs/print.h ${TOP_INCDIR}/afs/prserver.h ${TOP_INCDIR}/afs/ptclient.h ${TOP_INCDIR}/afs/pterror.h ${TOP_INCDIR}/afs/ptint.h ${TOP_INCDIR}/afs/ptserver.h readgroup readpwd testpt
++PICTARGET =../pic/ptserver
++PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
++$(PICTARGET)/%.o: %.c $(PICTARGET)
++      $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
++
++$(PICTARGET):
++      mkdir -p $(PICTARGET)
++
++
++all: ukinstall ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a ${TOP_INCDIR}/afs/prclient.h ${TOP_INCDIR}/afs/prerror.h ${TOP_INCDIR}/afs/print.h ${TOP_INCDIR}/afs/prserver.h ${TOP_INCDIR}/afs/ptclient.h ${TOP_INCDIR}/afs/pterror.h ${TOP_INCDIR}/afs/ptint.h ${TOP_INCDIR}/afs/ptserver.h readgroup readpwd testpt $(PICOBJS)
+ 
+ #
+ # Build targets
+@@ -110,7 +120,7 @@
+       $(RM) -f pterror.h pterror.c
+       ${COMPILE_ET} pterror
+ 
+-libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
++libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o 
+       $(RM) -f $@
+       $(AR) crv $@ ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
+       $(RANLIB) $@
+@@ -250,7 +260,7 @@
+ clean:
+       $(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \
+       libprot.a pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \
+-      core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c
++      core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c $(PICTARGET)/*.o
+ 
+ include ../config/Makefile.version
+ ${DESTDIR}${afssrvlibexecdir}/ptserver: ptserver
+Index: src/rx/Makefile.in
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/rx/Makefile.in,v
+retrieving revision 1.9
+diff -u -r1.9 Makefile.in
+--- src/rx/Makefile.in 30 Jul 2003 17:23:45 -0000      1.9
++++ src/rx/Makefile.in 13 Oct 2003 04:23:03 -0000
+@@ -73,7 +73,7 @@
+ UKSRCS = $(KSRCS) rx_conncache.c
+ 
+ PICTARGET =../pic/rx
+-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
++PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
+ $(PICTARGET)/%.o: %.c $(PICTARGET)
+       $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+ 
+@@ -118,7 +118,7 @@
+ rxperf: rxperf.o librx.a
+       ${CC} -o $@ rxperf.o ${LIBS}
+ 
+-librx.a: ${LIBOBJS} RX_component_version_number.o
++librx.a: ${LIBOBJS} RX_component_version_number.o 
+       -$(RM) -f $@
+       $(AR) crv $@ ${LIBOBJS} RX_component_version_number.o
+       $(RANLIB) $@
+Index: src/sys/Makefile.in
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/sys/Makefile.in,v
+retrieving revision 1.10
+diff -u -r1.10 Makefile.in
+--- src/sys/Makefile.in        30 Jul 2003 17:23:45 -0000      1.10
++++ src/sys/Makefile.in        13 Oct 2003 04:23:03 -0000
+@@ -44,13 +44,14 @@
+ $(PICTARGET):
+       mkdir -p $(PICTARGET)
+ 
++OBJS = afssyscalls.o $(RMTOBJS)
+ 
+ OBJECTS= afssyscalls.o syscall.o
+ RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o 
+ 
+ include ../config/Makefile.version
+ 
+-all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall $(PICOBJS)
++all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall  $(PICOBJS) 
+       case "${SYS_NAME}" in \
+       rs_aix*)                        \
+               ${INSTALL} afs.exp ${TOP_LIBDIR};;      \
+@@ -78,7 +79,7 @@
+ ${DEST}/include/afs/afssyscalls.h: afssyscalls.h
+       ${INSTALL} $? $@
+ 
+-libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
++libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o 
+       -$(RM) -f $@
+       $(AR) crv $@ ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
+       $(RANLIB) $@
+Index: src/ubik/Makefile.in
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/ubik/Makefile.in,v
+retrieving revision 1.1.1.3
+diff -u -r1.1.1.3 Makefile.in
+--- src/ubik/Makefile.in       30 Jul 2003 17:13:20 -0000      1.1.1.3
++++ src/ubik/Makefile.in       13 Oct 2003 04:23:04 -0000
+@@ -44,7 +44,15 @@
+ RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+ COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+ 
+-all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client
++PICTARGET =../pic/ubik
++PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
++$(PICTARGET)/%.o: %.c $(PICTARGET)
++      $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
++
++$(PICTARGET):
++      mkdir -p $(PICTARGET)
++
++all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client $(PICOBJS)
+ 
+ utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
+       ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)
+@@ -85,7 +93,7 @@
+       $(RM) -f ubik.h uerrors.c
+       ${COMPILE_ET} uerrors -h ubik
+ 
+-libubik.a: ${LIBOBJS} AFS_component_version_number.o
++libubik.a: ${LIBOBJS} AFS_component_version_number.o 
+       -$(RM) -f $@
+       $(AR) crc $@ ${LIBOBJS} AFS_component_version_number.o
+       $(RANLIB) $@
+@@ -168,7 +176,7 @@
+ #
+ clean:
+       $(RM) -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c
+-      $(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
++      $(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h $(PICTARGET)/*.o
+ 
+ include ../config/Makefile.version
+ 
+Index: src/util/Makefile.in
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/util/Makefile.in,v
+retrieving revision 1.9
+diff -u -r1.9 Makefile.in
+--- src/util/Makefile.in       13 Apr 2003 21:16:40 -0000      1.9
++++ src/util/Makefile.in       13 Oct 2003 04:23:04 -0000
+@@ -47,7 +47,7 @@
+ 
+ 
+ PICTARGET =../pic/util
+-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS)) 
++PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(objects)) 
+ $(PICTARGET)/%.o: %.c $(PICTARGET)
+       $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+ 
+@@ -73,7 +73,7 @@
+       ${TOP_INCDIR}/potpourri.h \
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libafsutil.a \
+-      sys
++      sys $(PICOBJS)
+ 
+ dirpath.h: dirpath.hin Makefile
+       ( sed \
+@@ -90,7 +90,7 @@
+               dirpath.hin >dirpath.h.tmp && \
+               mv dirpath.h.tmp dirpath.h )
+ 
+-util.a: ${objects} AFS_component_version_number.o $(PICOBJS)
++util.a: ${objects} AFS_component_version_number.o 
+       $(RM) -f util.a
+       $(AR) crv util.a ${objects} AFS_component_version_number.o
+       $(RANLIB) util.a

diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index 8f8e5db05327094a502565dfc77ad61568044052..ee11cd7d3ef7ca023eedc8b075e1eca903178afa 100644 (file)
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -76,7 +76,7 @@ pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o
                $(LD) $(LDFLAGS) -M mapfile -o $@ afs_setcred.o afs_auth.o afs_util.o\
                        $(SHOBJS) $(LIBS) ;; \
        *linux*) \
-               $(CC) $(LDFLAGS) $(PAM_CFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS)  `find ../pic/ -name "*.o" | grep -v AFS_compo`  -lpam;;\
+               $(CC) $(LDFLAGS) $(PAM_CFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS)  `find ../pic/ -name "*.o" | grep -v AFS_compo`  -lpam -lresolv;;\
        *fbsd*) \
                $(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
        * ) \

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index 4a1028d56da1ca6edc793481e284a4543f2810bb..1600aadda14e8a6e3af3a5f2c0337fb1a2fc0f8b 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -59,8 +59,18 @@ LIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libsys.a
 
+LIBOBJS = ptuser.o pterror.o ptint.cs.o ptint.xdr.o 
 
-all: ukinstall ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a ${TOP_INCDIR}/afs/prclient.h ${TOP_INCDIR}/afs/prerror.h ${TOP_INCDIR}/afs/print.h ${TOP_INCDIR}/afs/prserver.h ${TOP_INCDIR}/afs/ptclient.h ${TOP_INCDIR}/afs/pterror.h ${TOP_INCDIR}/afs/ptint.h ${TOP_INCDIR}/afs/ptserver.h readgroup readpwd testpt
+PICTARGET =../pic/ptserver
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
+$(PICTARGET)/%.o: %.c $(PICTARGET)
+       $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+
+$(PICTARGET):
+       mkdir -p $(PICTARGET)
+
+
+all: ukinstall ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a ${TOP_INCDIR}/afs/prclient.h ${TOP_INCDIR}/afs/prerror.h ${TOP_INCDIR}/afs/print.h ${TOP_INCDIR}/afs/prserver.h ${TOP_INCDIR}/afs/ptclient.h ${TOP_INCDIR}/afs/pterror.h ${TOP_INCDIR}/afs/ptint.h ${TOP_INCDIR}/afs/ptserver.h readgroup readpwd testpt $(PICOBJS)
 
 #
 # Build targets
@@ -110,7 +120,7 @@ pterror.h pterror.c: pterror.et
        $(RM) -f pterror.h pterror.c
        ${COMPILE_ET} pterror
 
-libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
+libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o 
        $(RM) -f $@
        $(AR) crv $@ ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
        $(RANLIB) $@
@@ -250,7 +260,7 @@ ${DEST}/include/afs/ptclient.h: ptclient.h
 clean:
        $(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \
        libprot.a pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \
-       core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c
+       core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c $(PICTARGET)/*.o
 
 include ../config/Makefile.version
 ${DESTDIR}${afssrvlibexecdir}/ptserver: ptserver

diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
index 4f28163be60f17241af4cb54c347e7eb0529ab65..26a845965aa18c9a108a3343e4c9b6aaa7138e54 100644 (file)
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@@ -73,7 +73,7 @@ KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \
 UKSRCS = $(KSRCS) rx_conncache.c
 
 PICTARGET =../pic/rx
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
 $(PICTARGET)/%.o: %.c $(PICTARGET)
        $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
 
@@ -118,7 +118,7 @@ xdr_refernce.o: xdr_refernce.c xdr.h
 rxperf: rxperf.o librx.a
        ${CC} -o $@ rxperf.o ${LIBS}
 
-librx.a: ${LIBOBJS} RX_component_version_number.o
+librx.a: ${LIBOBJS} RX_component_version_number.o 
        -$(RM) -f $@
        $(AR) crv $@ ${LIBOBJS} RX_component_version_number.o
        $(RANLIB) $@

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index e8a6377e928dc4f17fc9d1bdd4a3d21fb0e3f38a..bfe6fc08e33165a9b8f4d06e22e01e531946b98e 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -44,13 +44,14 @@ $(PICTARGET)/%.o: %.c $(PICTARGET)
 $(PICTARGET):
        mkdir -p $(PICTARGET)
 
+OBJS = afssyscalls.o $(RMTOBJS)
 
 OBJECTS= afssyscalls.o syscall.o
 RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o 
 
 include ../config/Makefile.version
 
-all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall $(PICOBJS)
+all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall  $(PICOBJS) 
        case "${SYS_NAME}" in \
        rs_aix*)                        \
                ${INSTALL} afs.exp ${TOP_LIBDIR};;      \
@@ -78,7 +79,7 @@ ${DEST}/bin/pagsh.krb: pagsh.krb
 ${DEST}/include/afs/afssyscalls.h: afssyscalls.h
        ${INSTALL} $? $@
 
-libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
+libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o 
        -$(RM) -f $@
        $(AR) crv $@ ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
        $(RANLIB) $@

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index dae2baadaf54867b929b8f0c23dfd166443d7636..558025db332646b85a37676c2c09a0b010c0d366 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -44,7 +44,15 @@ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
 RXGEN=${TOP_SRCDIR}/rxgen/rxgen
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 
-all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client
+PICTARGET =../pic/ubik
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
+$(PICTARGET)/%.o: %.c $(PICTARGET)
+       $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+
+$(PICTARGET):
+       mkdir -p $(PICTARGET)
+
+all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client $(PICOBJS)
 
 utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
        ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)
@@ -85,7 +93,7 @@ uerrors.c ubik.h: uerrors.et ubik.p.h
        $(RM) -f ubik.h uerrors.c
        ${COMPILE_ET} uerrors -h ubik
 
-libubik.a: ${LIBOBJS} AFS_component_version_number.o
+libubik.a: ${LIBOBJS} AFS_component_version_number.o 
        -$(RM) -f $@
        $(AR) crc $@ ${LIBOBJS} AFS_component_version_number.o
        $(RANLIB) $@
@@ -168,7 +176,7 @@ ${UKERNELDIR}/afs/uerrors.c: uerrors.c
 #
 clean:
        $(RM) -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c
-       $(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
+       $(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h $(PICTARGET)/*.o
 
 include ../config/Makefile.version
 

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 0ccd05672e4ac4ca4230c01813bef853c5ba8951..f9e4e87f57984fbc1c4d33d6fe055b8aa4c795f8 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -47,7 +47,7 @@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
 
 
 PICTARGET =../pic/util
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS)) 
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(objects)) 
 $(PICTARGET)/%.o: %.c $(PICTARGET)
        $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
 
@@ -73,7 +73,7 @@ all: ukinstall kinstall \
        ${TOP_INCDIR}/potpourri.h \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libafsutil.a \
-       sys
+       sys $(PICOBJS)
 
 dirpath.h: dirpath.hin Makefile
        ( sed \
@@ -90,7 +90,7 @@ dirpath.h: dirpath.hin Makefile
                dirpath.hin >dirpath.h.tmp && \
                mv dirpath.h.tmp dirpath.h )
 
-util.a: ${objects} AFS_component_version_number.o $(PICOBJS)
+util.a: ${objects} AFS_component_version_number.o 
        $(RM) -f util.a
        $(AR) crv util.a ${objects} AFS_component_version_number.o
        $(RANLIB) util.a