diff options
| author | Marcus Brinkmann <[email protected]> | 2005-10-20 19:21:30 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2005-10-20 19:21:30 +0000 |
| commit | 2b58d3449071d87a0f953f38c0ae7e2cf9be24bf (patch) | |
| tree | c832233e8dbe0550838ad4fdf6de1bdb44ea9c9c | |
| parent | 2005-10-20 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-2b58d3449071d87a0f953f38c0ae7e2cf9be24bf.tar.gz gpgme-2b58d3449071d87a0f953f38c0ae7e2cf9be24bf.zip | |
2005-10-20 Marcus Brinkmann <[email protected]>
* Makefile.am: Build versioninfo.lo, not versioninfo.o. Also, fix
the whole mess.
| -rw-r--r-- | gpgme/ChangeLog | 5 | ||||
| -rw-r--r-- | gpgme/Makefile.am | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 880ec6bc..30d2b508 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2005-10-20 Marcus Brinkmann <[email protected]> + + * Makefile.am: Build versioninfo.lo, not versioninfo.o. Also, fix + the whole mess. + 2005-10-16 Marcus Brinkmann <[email protected]> * rungpg.c (gpg_edit): Don't add a key argument if in card edit diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am index 94b46aa6..ece1adfd 100644 --- a/gpgme/Makefile.am +++ b/gpgme/Makefile.am @@ -96,21 +96,21 @@ LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \ `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -%.o : %.rc +%.lo : %.rc $(LTRCCOMPILE) -i $< -o $@ -gpgme_res = versioninfo.o -gpgme_res_ldflag = -Wl,$(gpgme_res) +gpgme_res = versioninfo.lo +gpgme_res_ldflag = -Wl,.libs/versioninfo.o no_undefined = -no-undefined export_symbols = -export-symbols $(srcdir)/gpgme.def install-def-file: - $(INSTALL) gpg-error.def $(DESTDIR)$(libdir)/gpgme.def + $(INSTALL) $(srcdir)/gpgme.def $(DESTDIR)$(libdir)/gpgme.def uninstall-def-file: -rm $(DESTDIR)$(libdir)/gpgme.def -libgpgme_la_DEPENDENCIES = $(gpgme_res) gpgme.def +gpgme_deps = $(gpgme_res) gpgme.def else gpgme_res = @@ -120,13 +120,14 @@ export_symbols = install-def-file: uninstall-def-file: +gpgme_deps = endif libgpgme_la_LDFLAGS = $(gpgme_res_ldflag) $(no_undefined) $(export_symbols) \ $(libgpgme_version_script_cmd) -version-info \ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ 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@ \ @GPG_ERROR_LIBS@ |