GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-10-20 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* Makefile.am: Build versioninfo.lo, not versioninfo.o.  Also, fix
	the whole mess.
This commit is contained in:
Marcus Brinkmann 2005-10-20 19:21:30 +00:00
parent 36dc669515
commit 2b58d34490
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gpgme/ChangeLog
View File

@ -1,3 +1,8 @@
2005-10-20 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am: Build versioninfo.lo, not versioninfo.o. Also, fix
the whole mess.
2005-10-16 Marcus Brinkmann <marcus@g10code.de> 2005-10-16 Marcus Brinkmann <marcus@g10code.de>
* rungpg.c (gpg_edit): Don't add a key argument if in card edit * rungpg.c (gpg_edit): Don't add a key argument if in card edit

13
gpgme/Makefile.am
View File

@ -96,21 +96,21 @@ LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
`echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'` sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.o : %.rc %.lo : %.rc
$(LTRCCOMPILE) -i $< -o $@ $(LTRCCOMPILE) -i $< -o $@
gpgme_res = versioninfo.o gpgme_res = versioninfo.lo
gpgme_res_ldflag = -Wl,$(gpgme_res) gpgme_res_ldflag = -Wl,.libs/versioninfo.o
no_undefined = -no-undefined no_undefined = -no-undefined
export_symbols = -export-symbols $(srcdir)/gpgme.def export_symbols = -export-symbols $(srcdir)/gpgme.def
install-def-file: install-def-file:
$(INSTALL) gpg-error.def $(DESTDIR)$(libdir)/gpgme.def $(INSTALL) $(srcdir)/gpgme.def $(DESTDIR)$(libdir)/gpgme.def
uninstall-def-file: uninstall-def-file:
-rm $(DESTDIR)$(libdir)/gpgme.def -rm $(DESTDIR)$(libdir)/gpgme.def
libgpgme_la_DEPENDENCIES = $(gpgme_res) gpgme.def gpgme_deps = $(gpgme_res) gpgme.def
else else
gpgme_res = gpgme_res =
@ -120,13 +120,14 @@ export_symbols =
install-def-file: install-def-file:
uninstall-def-file: uninstall-def-file:
gpgme_deps =
endif endif
libgpgme_la_LDFLAGS = $(gpgme_res_ldflag) $(no_undefined) $(export_symbols) \ libgpgme_la_LDFLAGS = $(gpgme_res_ldflag) $(no_undefined) $(export_symbols) \
$(libgpgme_version_script_cmd) -version-info \ $(libgpgme_version_script_cmd) -version-info \
@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
libgpgme_la_DEPENDENCIES = libgpgme-real.la $(assuan_libobjs) \ libgpgme_la_DEPENDENCIES = libgpgme-real.la $(assuan_libobjs) \
@LTLIBOBJS@ $(srcdir)/libgpgme.vers @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps)
libgpgme_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \ libgpgme_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \
@GPG_ERROR_LIBS@ @GPG_ERROR_LIBS@