cmd: Add support for pulling options from files

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

diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in
index 260bcc0..c084b8b 100644 (file)
--- a/src/cmd/Makefile.in
+++ b/src/cmd/Makefile.in
@@ -7,15 +7,14 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+include @TOP_OBJDIR@/src/config/Makefile.lwp
 
-LIBOBJS=cmd_errors.o cmd.o 
+
+LIBOBJS=cmd_errors.o cmd.o config_file.o
+LIBPICOBJS=cmd_errors_pic.o cmd_pic.o config_file_pic.o
 LIB64OBJS=cmd_errors64.o cmd64.o 
 
-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
 
@@ -24,6 +23,9 @@ 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} $? $@
 
@@ -40,11 +42,25 @@ cmd_errors.o: cmd_errors.c
 
 cmd.o: cmd.c cmd.h
 
+config_file.o: $(TOP_SRCDIR)/external/heimdal/krb5/config_file.c krb5_locl.h
+       $(AFS_CCRULE) -c $(TOP_SRCDIR)/external/heimdal/krb5/config_file.c
+
 cmd_errors64.o: cmd_errors.c
-       ${CC} ${OPTMZ} -I. -I${TOP_OBJDIR}/src/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. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o ${srcdir}/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
+
+config_file_pic.o: $(TOP_SRCDIR)/external/heimdal/krb5/config_file.c krb5_locl.h
+       $(SHD_CCRULE) $(TOP_SRCDIR)/external/heimdal/krb5/config_file.c
 
 libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o
        -$(RM) -f $@
@@ -56,26 +72,38 @@ 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: libcmd.a cmd.h
+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
+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