pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / clients / klist / Makefile.in

diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 4e067eaa84ba5a65426fa752cd725e5b3b35b8c5..c2b4d412a37d771779096c1df339fd0ff8393476 100644 (file)
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,21 +1,31 @@
-thisconfigdir=./..
-myfulldir=clients/klist
-mydir=klist
-BUILDTOP=$(REL)$(U)$(S)$(U)
+mydir=clients$(S)klist
+BUILDTOP=$(REL)..$(S)..
+DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-all-unix:: klist
-all-windows:: $(OUTPRE)klist.exe
-all-mac::
+SRCS = klist.c
+
+##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
+##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
 
+##WIN32##KLIST=$(OUTPRE)klist.exe
 
-klist: klist.o $(KRB4COMPAT_DEPLIBS)
-       $(CC_LINK) -o $@ klist.o $(KRB4COMPAT_LIBS)
+##WIN32##EXERES=$(KLIST:.exe=.res)
 
-$(OUTPRE)klist.exe: $(OUTPRE)klist.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib $(KLIB) $(CLIB)
-       link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib
+##WIN32##$(EXERES): $(VERSIONRC)
+##WIN32##        $(RC) $(RCFLAGS) -DKLIST_APP -fo $@ -r $**
+
+all-unix:: klist
+##WIN32##all-windows:: $(KLIST)
+
+klist: klist.o $(KRB5_BASE_DEPLIBS)
+       $(CC_LINK) -o $@ klist.o $(KRB5_BASE_LIBS)
+
+##WIN32##$(KLIST): $(OUTPRE)klist.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib $(SLIB) $(KLIB) $(CLIB) $(EXERES)
+##WIN32##      link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB)
+##WIN32##      $(_VC_MANIFEST_EMBED_EXE)
 
 clean-unix::
        $(RM) klist.o klist
@@ -27,3 +37,4 @@ install-unix::
          $(INSTALL_DATA) $(srcdir)/$$f.M \
                $(DESTDIR)$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
        done
+