diff options
Diffstat (limited to 'sm')
-rw-r--r-- | sm/Makefile.am | 13 | ||||
-rw-r--r-- | sm/gpgsm.w32-manifest.in | 9 |
2 files changed, 15 insertions, 7 deletions
diff --git a/sm/Makefile.am b/sm/Makefile.am index 0bc7640c0..ee0e91dbf 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -17,7 +17,8 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc gpgsm.w32-manifest.in +EXTRA_DIST = ChangeLog-2011 \ + gpgsm-w32info.rc gpgsm.w32-manifest.in bin_PROGRAMS = gpgsm @@ -27,10 +28,8 @@ AM_CPPFLAGS = -DKEYBOX_WITH_X509=1 include $(top_srcdir)/am/cmacros.am if HAVE_W32_SYSTEM -gpgsm_robjs = $(resource_objs) gpgsm-w32info.o -gpgsm-w32info.o : gpgsm.w32-manifest -else -gpgsm_robjs = +gpgsm_rc_objs = $(resource_objs) gpgsm-w32info.o +gpgsm-w32info.o : gpgsm.w32-manifest ../common/w32info-rc.h endif gpgsm_SOURCES = \ @@ -65,8 +64,10 @@ common_libs = ../kbx/libkeybox509.a $(libcommon) gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \ - $(LIBICONV) $(gpgsm_robjs) $(extra_sys_libs) $(NETLIBS) + $(LIBICONV) $(gpgsm_rc_objs) $(extra_sys_libs) $(NETLIBS) gpgsm_LDFLAGS = $(extra_bin_ldflags) +gpgsm_DEPENDENCIES = $(gpgsm_rc_objs) + # Make sure that all libs are build before we use them. This is # important for things like make -j2. diff --git a/sm/gpgsm.w32-manifest.in b/sm/gpgsm.w32-manifest.in index 30557889e..413b3e34a 100644 --- a/sm/gpgsm.w32-manifest.in +++ b/sm/gpgsm.w32-manifest.in @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<description>GNU Privacy Guard (X409/CMS tool)</description> +<description>GNU Privacy Guard (X.509/CMS Tool)</description> <assemblyIdentity type="win32" name="GnuPG.gpgsm" @@ -15,4 +15,11 @@ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista --> </application> </compatibility> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker"/> + </requestedPrivileges> + </security> +</trustInfo> </assembly> |