diff options
| author | JinWang An <jinwang.an@samsung.com> | 2021-12-01 16:54:37 +0900 |
|---|---|---|
| committer | JinWang An <jinwang.an@samsung.com> | 2021-12-01 16:54:37 +0900 |
| commit | 398648eddb70bc844e1bc5996521e87dea3188e9 (patch) | |
| tree | 1c186970f769d3d37d9ec3248a7145cdc12c0fd3 /src | |
| parent | fd4d11c14daa6a54c81202dffc02cc419fa67568 (diff) | |
| download | gpgme-398648eddb70bc844e1bc5996521e87dea3188e9.tar.gz gpgme-398648eddb70bc844e1bc5996521e87dea3188e9.tar.bz2 gpgme-398648eddb70bc844e1bc5996521e87dea3188e9.zip | |
Imported Upstream version 1.11.1upstream/1.11.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 9 | ||||
| -rw-r--r-- | src/decrypt.c | 1 | ||||
| -rw-r--r-- | src/verify.c | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c2d4a84..0a196e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,8 +104,6 @@ gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS) -# We use -no-install temporary during development. -gpgme_json_LDFLAGS = -no-install if HAVE_W32_SYSTEM diff --git a/src/Makefile.in b/src/Makefile.in index 5eac9e1..40fec0f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -107,7 +107,7 @@ subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/build-aux/mkinstalldirs \ $(srcdir)/versioninfo.rc.in $(srcdir)/gpgme.h.in \ - $(srcdir)/gpgme-config.in stpcpy.c setenv.c ttyname_r.c \ + $(srcdir)/gpgme-config.in ttyname_r.c setenv.c stpcpy.c \ $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ @@ -235,9 +235,6 @@ am_gpgme_json_OBJECTS = gpgme-json.$(OBJEXT) cJSON.$(OBJEXT) gpgme_json_OBJECTS = $(am_gpgme_json_OBJECTS) am__DEPENDENCIES_2 = gpgme_json_DEPENDENCIES = libgpgme.la $(am__DEPENDENCIES_2) -gpgme_json_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(gpgme_json_LDFLAGS) $(LDFLAGS) -o $@ am_gpgme_tool_OBJECTS = gpgme-tool.$(OBJEXT) argparse.$(OBJEXT) gpgme_tool_OBJECTS = $(am_gpgme_tool_OBJECTS) gpgme_tool_DEPENDENCIES = libgpgme.la @@ -565,8 +562,6 @@ gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS) -# We use -no-install temporary during development. -gpgme_json_LDFLAGS = -no-install @HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE) @HAVE_W32_SYSTEM_TRUE@SUFFIXES = .rc .lo @@ -781,7 +776,7 @@ clean-libexecPROGRAMS: gpgme-json$(EXEEXT): $(gpgme_json_OBJECTS) $(gpgme_json_DEPENDENCIES) $(EXTRA_gpgme_json_DEPENDENCIES) @rm -f gpgme-json$(EXEEXT) - $(AM_V_CCLD)$(gpgme_json_LINK) $(gpgme_json_OBJECTS) $(gpgme_json_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(gpgme_json_OBJECTS) $(gpgme_json_LDADD) $(LIBS) gpgme-tool$(EXEEXT): $(gpgme_tool_OBJECTS) $(gpgme_tool_DEPENDENCIES) $(EXTRA_gpgme_tool_DEPENDENCIES) @rm -f gpgme-tool$(EXEEXT) diff --git a/src/decrypt.c b/src/decrypt.c index 155e18e..0fc7019 100644 --- a/src/decrypt.c +++ b/src/decrypt.c @@ -414,7 +414,6 @@ _gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code, err = _gpgme_parse_plaintext (args, &opd->result.file_name, &mime); if (err) return err; - gpgrt_log_debug ("decrypt.c setting mime to %d\n", mime); opd->result.is_mime = !!mime; } break; diff --git a/src/verify.c b/src/verify.c index bd437c9..26b205a 100644 --- a/src/verify.c +++ b/src/verify.c @@ -1096,7 +1096,6 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args) err = _gpgme_parse_plaintext (args, &opd->result.file_name, &mime); if (err) return err; - gpgrt_log_debug ("verify.c: setting mime to %d\n", mime); opd->result.is_mime = !!mime; } break; |