cmd: Fix objdir builds

[openafs.git] / src / cmd / Makefile.in

diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in
index f564e1e..68947ae 100644 (file)
--- a/src/cmd/Makefile.in
+++ b/src/cmd/Makefile.in
@@ -5,53 +5,60 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-DEST=@DEST@
-TOP_INCDIR=@TOP_INCDIR@
-TOP_LIBDIR=@TOP_LIBDIR@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-libdir=@libdir@
-includedir=@includedir@
-mandir=@mandir@
-afssrvbindir=@afssrvbindir@
-afssrvsbindir=@afssrvsbindir@
-afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
-TOP_SRCDIR=@TOP_SRCDIR@
-SYS_NAME=@AFS_SYSNAME@
-
-SHELL = /bin/sh
-
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+srcdir=@srcdir@
+include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.lwp
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 LIBOBJS=cmd_errors.o cmd.o 
+LIBPICOBJS=cmd_errors_pic.o cmd_pic.o
 LIB64OBJS=cmd_errors64.o cmd64.o 
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
-
-all: ${TOP_LIBDIR}/libcmd.a ${TOP_INCDIR}/afs/cmd.h
+all: ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcmd_pic.a ${TOP_INCDIR}/afs/cmd.h
 
 all64: all ${TOP_LIBDIR}/libcmd64.a
 
-cmd.h cmd_errors.c: cmd_errors.et cmd.p.h
+generated: cmd.h cmd_errors.c
+
+${TOP_LIBDIR}/libcmd.a: libcmd.a
+       ${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libcmd_pic.a: libcmd_pic.a
+       ${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libcmd64.a: libcmd64.a
+       ${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/cmd.h: cmd.h
+       ${INSTALL_DATA} $? $@
+
+cmd.h: cmd_errors.et cmd.p.h
        $(RM) -f cmd.h cmd_errors.c
-       ${COMPILE_ET} cmd_errors -h cmd
+       ${COMPILE_ET} -p ${srcdir} cmd_errors -h cmd
+
+cmd_errors.c: cmd.h 
 
 cmd_errors.o: cmd_errors.c
 
 cmd.o: cmd.c cmd.h
 
 cmd_errors64.o: cmd_errors.c
-       ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c
+       ${CC} $(COMMON_CFLAGS) $(CPPFLAGS) ${XCFLAGS64} \
+               -c -o cmd_errors64.o cmd_errors.c
 
 cmd64.o: cmd.c cmd.h
-       ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o cmd.c
+       ${CC} $(COMMON_CFLAGS) $(CPPFLAGS) ${XCFLAGS64} \
+               -c -o cmd64.o ${srcdir}/cmd.c
+
+cmd_errors_pic.o: cmd_errors.c
+       $(SHD_CCRULE) cmd_errors.c
 
+cmd_pic.o: cmd.c cmd.h
+       $(SHD_CCRULE) ${srcdir}/cmd.c
 
 libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o
        -$(RM) -f $@
@@ -63,24 +70,41 @@ libcmd.a: ${LIBOBJS} AFS_component_version_number.o
        $(AR) crv $@ ${LIBOBJS} AFS_component_version_number.o
        $(RANLIB) $@
 
+libcmd_pic.a: ${LIBPICOBJS} AFS_component_version_number_pic.o
+       -$(RM) -f $@
+       $(AR) crv $@ ${LIBPICOBJS} AFS_component_version_number_pic.o
+       $(RANLIB) $@
+
 AFS_component_version_number64.o: AFS_component_version_number.c
-       ${CC} ${OPTMZ} -I${TOP_INCDIR} ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c
+       ${CC} $(COMMON_CFLAGS) $(CPPFLAGS) ${XCFLAGS64} \
+               -c -o AFS_component_version_number64.o \
+               AFS_component_version_number.c
+
+AFS_component_version_number_pic.o: AFS_component_version_number.c
+       $(SHD_CCRULE) AFS_component_version_number.c
 
 #
 # Install targets
 #
-install: ${DESTDIR}${libdir}/afs/libcmd.a ${DESTDIR}${includedir}/afs/cmd.h
-
-install64: install ${DESTDIR}${libdir}/afs/libcmd64.a
-
-${DEST}/include/afs/cmd.h: cmd.h
-       ${INSTALL} $? $@
-
-${DEST}/lib/afs/libcmd.a: libcmd.a
-       ${INSTALL} $? $@
-
-${DEST}/lib/afs/libcmd64.a: libcmd64.a
-       ${INSTALL} $? $@
+install: libcmd.a libcmd_pic.a cmd.h
+       ${INSTALL} -d ${DESTDIR}${libdir}/afs
+       ${INSTALL} -d ${DESTDIR}${includedir}/afs
+       ${INSTALL_DATA} libcmd.a ${DESTDIR}${libdir}/afs/libcmd.a
+       ${INSTALL_DATA} libcmd_pic.a ${DESTDIR}${libdir}/afs/libcmd_pic.a
+       ${INSTALL_DATA} cmd.h ${DESTDIR}${includedir}/afs/cmd.h
+
+install64: install libcmd64.a
+       ${INSTALL_DATA} libcmd64.a ${DESTDIR}${libdir}/afs/libcmd64.a
+
+dest: libcmd.a cmd.h libcmd_pic.a
+       ${INSTALL} -d ${DEST}/lib/afs
+       ${INSTALL} -d ${DEST}/include/afs
+       ${INSTALL_DATA} libcmd.a ${DEST}/lib/afs/libcmd.a
+       ${INSTALL_DATA} cmd.h ${DEST}/include/afs/cmd.h
+       ${INSTALL_DATA} libcmd_pic.a ${DEST}/lib/afs/libcmd_pic.a
+
+dest64: dest libcmd64.a
+       ${INSTALL_DATA} libcmd64.a ${DEST}/lib/afs/libcmd64.a
 
 #
 # Misc targets
@@ -92,24 +116,3 @@ clean:
        $(RM) -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c
 
 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libcmd.a: libcmd.a
-       ${INSTALL} $? $@
-
-${TOP_LIBDIR}/libcmd.a: libcmd.a
-       ${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libcmd64.a: libcmd64.a
-       ${INSTALL} $? $@
-
-${TOP_LIBDIR}/libcmd64.a: libcmd64.a
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/cmd.h: cmd.h
-       ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/cmd.h: cmd.h
-       ${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libcmd.a ${DEST}/include/afs/cmd.h
-
-dest64: dest ${DEST}/lib/afs/libcmd64.a