From: Danilo Almeida Date: Tue, 18 May 1999 00:17:17 +0000 (+0000) Subject: Makefile.in: Use only one resource file per binary. X-Git-Tag: krb5-1.1-beta1~145 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=98e5ac3e4c002ee5a7511b9e336b26bced424025;p=krb5.git Makefile.in: Use only one resource file per binary. krb5.rc: Remove silly _MSDOS #ifdef. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11459 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index c70cc9a1d..4bab41370 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,9 @@ +Mon May 17 19:50:53 1999 Danilo Almeida + + * Makefile.in: Use only one resource file per binary. + + * krb5.rc: Remove silly _MSDOS #ifdef. + Mon May 17 12:37:25 1999 Danilo Almeida * Makefile.in: Get rid of win16 support/clutter. Build separate diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 9a9c44448..f80486579 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -54,7 +54,7 @@ SKDEF = krb5_32.def SGLIB = $(OUTPRE)sapgss32.lib SKLIB = $(OUTPRE)sapkrb32.lib -KRB5RES = $(OUTPRE)krb5.res +KRB5RC = krb5.rc VERSIONRC = $(BUILDTOP)\windows\version.rc WINLIBS = kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib \ @@ -74,60 +74,59 @@ GGLUE=$(GSS_GLUE) K4GLUE=$(K4_GLUE) SKGLUE=$(SAP_GLUE) -VER_RC_FLAGS=$(CPPFLAGS) -D_WIN32 -D_MSDOS_ -DRES_ONLY - -##WIN32##CVER=$(CLIB:.lib=.res) -##WIN32##PVER=$(PLIB:.lib=.res) -##WIN32##KVER=$(KLIB:.lib=.res) -##WIN32##GVER=$(GLIB:.lib=.res) -##WIN32##K4VER=$(K4LIB:.lib=.res) -##WIN32##SKVER=$(SKLIB:.lib=.res) -##WIN32##SGVER=$(SGLIB:.lib=.res) - -##WIN32##$(CVER): $(VERSIONRC) -##WIN32## $(RC) $(VER_RC_FLAGS) -DCE_LIB -fo $@ -r $** -##WIN32##$(PVER): $(VERSIONRC) -##WIN32## $(RC) $(VER_RC_FLAGS) -DPROF_LIB -fo $@ -r $** -##WIN32##$(KVER): $(VERSIONRC) -##WIN32## $(RC) $(VER_RC_FLAGS) -DKRB5_LIB -fo $@ -r $** -##WIN32##$(K4VER): $(VERSIONRC) -##WIN32## $(RC) $(VER_RC_FLAGS) -DKRB4_LIB -fo $@ -r $** -##WIN32##$(GVER): $(VERSIONRC) -##WIN32## $(RC) $(VER_RC_FLAGS) -DGSSAPI_LIB -fo $@ -r $** -##WIN32##$(SKVER): $(VERSIONRC) -##WIN32## $(RC) $(VER_RC_FLAGS) -DSAPKRB_LIB -fo $@ -r $** -##WIN32##$(SGVER): $(VERSIONRC) -##WIN32## $(RC) $(VER_RC_FLAGS) -DSAPGSS_LIB -fo $@ -r $** - -##WIN32##$(CLIB): $(CDEF) $(CLIBS) $(CGLUE) $(CVER) +RCFLAGS=$(CPPFLAGS) -D_WIN32 -D_MSDOS_ -DRES_ONLY + +##WIN32##CRES=$(CLIB:.lib=.res) +##WIN32##PRES=$(PLIB:.lib=.res) +##WIN32##KRES=$(KLIB:.lib=.res) +##WIN32##GRES=$(GLIB:.lib=.res) +##WIN32##K4RES=$(K4LIB:.lib=.res) +##WIN32##SKRES=$(SKLIB:.lib=.res) +##WIN32##SGRES=$(SGLIB:.lib=.res) + +##WIN32##$(CRES): $(VERSIONRC) +##WIN32## $(RC) $(RCFLAGS) -DCE_LIB -fo $@ -r $** +##WIN32##$(PRES): $(VERSIONRC) +##WIN32## $(RC) $(RCFLAGS) -DPROF_LIB -fo $@ -r $** +##WIN32##$(KRES): $(KRB5RC) +##WIN32## $(RC) $(RCFLAGS) -DKRB5_LIB -fo $@ -r $** +##WIN32##$(K4RES): $(VERSIONRC) +##WIN32## $(RC) $(RCFLAGS) -DKRB4_LIB -fo $@ -r $** +##WIN32##$(GRES): $(VERSIONRC) +##WIN32## $(RC) $(RCFLAGS) -DGSSAPI_LIB -fo $@ -r $** +##WIN32##$(SKRES): $(KRB5RC) +##WIN32## $(RC) $(RCFLAGS) -DSAPKRB_LIB -fo $@ -r $** +##WIN32##$(SGRES): $(VERSIONRC) +##WIN32## $(RC) $(RCFLAGS) -DSAPGSS_LIB -fo $@ -r $** +##WIN32##$(KRB5RC): $(VERSIONRC) + +##WIN32##$(CLIB): $(CDEF) $(CLIBS) $(CGLUE) $(CRES) ##WIN32## link $(WINDLLFLAGS) -def:$(CDEF) -out:$*.dll \ -##WIN32## $(CLIBS) $(CGLUE) $(CVER) $(WINLIBS) +##WIN32## $(CLIBS) $(CGLUE) $(CRES) $(WINLIBS) -##WIN32##$(PLIB): $(PDEF) $(PLIBS) $(PGLUE) $(PVER) $(CLIB) +##WIN32##$(PLIB): $(PDEF) $(PLIBS) $(PGLUE) $(PRES) $(CLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(PDEF) -out:$*.dll \ -##WIN32## $(PLIBS) $(PGLUE) $(PVER) $(CLIB) $(WINLIBS) +##WIN32## $(PLIBS) $(PGLUE) $(PRES) $(CLIB) $(WINLIBS) -##WIN32##$(KLIB): $(KDEF) $(KLIBS) $(KGLUE) $(KVER) $(KRB5RES) $(CLIB) $(MITLIBS) +##WIN32##$(KLIB): $(KDEF) $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(MITLIBS) ##WIN32## link $(WINDLLFLAGS) -def:$(KDEF) -out:$*.dll \ -##WIN32## $(KLIBS) $(KGLUE) $(KVER) $(KRB5RES) $(CLIB) $(MITLIBS) \ -##WIN32## $(WINLIBS) +##WIN32## $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(MITLIBS) $(WINLIBS) -##WIN32##$(GLIB): $(GDEF) $(GLIBS) $(GGLUE) $(GVER) $(KLIB) $(CLIB) +##WIN32##$(GLIB): $(GDEF) $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(GDEF) -out:$*.dll \ -##WIN32## $(GLIBS) $(GGLUE) $(GVER) $(KLIB) $(CLIB) $(WINLIBS) +##WIN32## $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(WINLIBS) -##WIN32##$(K4LIB): $(K4DEF) $(K4LIBS) $(K4GLUE) $(K4VER) $(KLIB) $(CLIB) $(PLIB) +##WIN32##$(K4LIB): $(K4DEF) $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(K4DEF) -out:$*.dll \ -##WIN32## $(K4LIBS) $(K4GLUE) $(K4VER) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) +##WIN32## $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) -##WIN32##$(SKLIB): $(KDEF) $(KLIBS) $(SKGLUE) $(SKVER) $(KRB5RES) $(CLIB) $(MITLIBS) +##WIN32##$(SKLIB): $(KDEF) $(KLIBS) $(SKGLUE) $(SKRES) $(CLIB) $(MITLIBS) ##WIN32## link $(WINDLLFLAGS) -def:$(KDEF) -out:$*.dll \ -##WIN32## $(KLIBS) $(SKGLUE) $(SKVER) $(KRB5RES) $(CLIB) $(MITLIBS) \ -##WIN32## $(WINLIBS) +##WIN32## $(KLIBS) $(SKGLUE) $(SKRES) $(CLIB) $(MITLIBS) $(WINLIBS) -##WIN32##$(SGLIB): $(GDEF) $(GLIBS) $(GGLUE) $(SGVER) $(SKLIB) $(CLIB) $(MITLIBS) +##WIN32##$(SGLIB): $(GDEF) $(GLIBS) $(GGLUE) $(SGRES) $(SKLIB) $(CLIB) $(MITLIBS) ##WIN32## link $(WINDLLFLAGS) -def:$(GDEF) -out:$*.dll \ -##WIN32## $(GLIBS) $(GGLUE) $(SGVER) $(SKLIB) $(CLIB) $(MITLIBS) $(WINLIBS) +##WIN32## $(GLIBS) $(GGLUE) $(SGRES) $(SKLIB) $(CLIB) $(MITLIBS) $(WINLIBS) ##MIT##lib-windows:: $(SKLIB) $(SGLIB) @@ -142,9 +141,6 @@ $(GSS_GLUE): win_glue.c $(NO_GLUE): win_glue.c $(CC) $(CFLAGS) /c /Fo$@ $** -$(KRB5RES): krb5.rc - $(RC) $(CPPFLAGS) -DKRB5 -fo $@ -r $** - # Build Convenience comerr.lib: $(CLIB) krb4.lib: $(K4LIB) diff --git a/src/lib/krb5.rc b/src/lib/krb5.rc index 0fe10ecf9..9fc24289b 100644 --- a/src/lib/krb5.rc +++ b/src/lib/krb5.rc @@ -38,6 +38,4 @@ FONT 8, "Helv" PUSHBUTTON "&Cancel", IDCANCEL, 107, 61, 40, 14 } -#ifdef _MSDOS #include "..\windows\version.rc" -#endif