diff options
| author | Werner Koch <[email protected]> | 2007-07-04 09:34:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-07-04 09:34:28 +0000 |
| commit | f54b85bc2d9b80f40ee025f74857fb3bb1436f9a (patch) | |
| tree | 49c49918b0e18b84ab5b242d796e36cdc6215710 /agent/Makefile.am | |
| parent | More W32 related changes (diff) | |
| download | gnupg-f54b85bc2d9b80f40ee025f74857fb3bb1436f9a.tar.gz gnupg-f54b85bc2d9b80f40ee025f74857fb3bb1436f9a.zip | |
A bunch of minor changes for Windows.
Diffstat (limited to 'agent/Makefile.am')
| -rw-r--r-- | agent/Makefile.am | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am index 1a8047856..74c1cf810 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = gpg-agent libexec_PROGRAMS = gpg-protect-tool gpg-preset-passphrase noinst_PROGRAMS = $(TESTS) -EXTRA_DIST = gpg-agent.ico gpg-agent-resource.rc +# EXTRA_DIST = gpg-agent.ico gpg-agent-resource.rc AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl @@ -47,25 +47,21 @@ gpg_agent_SOURCES = \ call-scd.c \ learncard.c -if HAVE_W32_SYSTEM -gpg_agent_SOURCES += w32main.c w32main.h -endif - common_libs = ../jnlib/libjnlib.a $(libcommon) ../gl/libgnu.a commonpth_libs = ../jnlib/libjnlib.a $(libcommonpth) ../gl/libgnu.a pwquery_libs = ../common/libsimple-pwquery.a -if HAVE_W32_SYSTEM -.rc.o: - $(WINDRES) `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ - sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -i $< -o $@ - -gpg_agent_res_ldflags = -Wl,gpg-agent-resource.o -Wl,--subsystem,windows -gpg_agent_res_deps = gpg-agent-resource.o -else +#if HAVE_W32_SYSTEM +#.rc.o: +# $(WINDRES) `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ +# sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -i $< -o $@ +# +#gpg_agent_res_ldflags = -Wl,gpg-agent-resource.o -Wl,--subsystem,windows +#gpg_agent_res_deps = gpg-agent-resource.o +#else gpg_agent_res_ldflags = gpg_agent_res_deps = -endif +#endif gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) |