Fix a memory access and a double slash bug.
[gpgme.git] / src / Makefile.am
index d4f4ba7..82f5327 100644 (file)
 ## Process this file with automake to produce Makefile.in
 
 # Note: moc_kdpipeiodevice should actually be a dependcy below.
-EXTRA_DIST = gpgme-config.in gpgme.m4 mkstatus libgpgme.vers \
+EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
             gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
-BUILT_SOURCES = status-table.h
-MOSTLYCLEANFILES = status-table.h
+
 bin_SCRIPTS = gpgme-config
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gpgme.m4
@@ -67,30 +66,6 @@ if HAVE_W32CE_SYSTEM
 system_components += w32-ce.h w32-ce.c
 endif
 
-if HAVE_GPGSM
-gpgsm_components = engine-gpgsm.c
-else
-gpgsm_components =
-endif
-
-if HAVE_ASSUAN
-assuan_components = assuan-support.c engine-assuan.c
-else
-assuan_components =
-endif
-
-if HAVE_GPGCONF
-gpgconf_components = engine-gpgconf.c
-else
-gpgconf_components =
-endif
-
-if HAVE_G13
-g13_components = engine-g13.c
-else
-g13_components =
-endif
-
 if HAVE_UISERVER
 uiserver_components = engine-uiserver.c
 else
@@ -104,8 +79,9 @@ endif
 # unresolved symbols to the thread module.
 main_sources =                                                         \
        util.h conversion.c get-env.c context.h ops.h                   \
+       parsetlv.c parsetlv.h                                           \
        data.h data.c data-fd.c data-stream.c data-mem.c data-user.c    \
-       data-compat.c                                                   \
+       data-compat.c data-identify.c                                   \
        signers.c sig-notation.c                                        \
        wait.c wait-global.c wait-private.c wait-user.c wait.h          \
        op-support.c                                                    \
@@ -113,14 +89,14 @@ main_sources =                                                             \
        sign.c passphrase.c progress.c                                  \
        key.c keylist.c trust-item.c trustlist.c                        \
        import.c export.c genkey.c delete.c edit.c getauditlog.c        \
-       opassuan.c passwd.c                                             \
-       engine.h engine-backend.h engine.c engine-gpg.c status-table.h  \
-       extra-stati.h                                                   \
-       $(gpgsm_components) $(assuan_components) $(gpgconf_components)  \
+       opassuan.c passwd.c spawn.c assuan-support.c                    \
+       engine.h engine-backend.h engine.c engine-gpg.c status-table.c  \
+       engine-gpgsm.c engine-assuan.c engine-gpgconf.c                 \
        $(uiserver_components)                                          \
-       $(g13_components) vfs-mount.c vfs-create.c                      \
+       engine-g13.c vfs-mount.c vfs-create.c                           \
+       engine-spawn.c                                                  \
        gpgconf.c                                                       \
-       sema.h priv-io.h $(system_components) dirinfo.c                 \
+       sema.h priv-io.h $(system_components) sys-util.h dirinfo.c      \
        debug.c debug.h gpgme.c version.c error.c
 
 libgpgme_la_SOURCES = $(main_sources)                                  \
@@ -174,6 +150,7 @@ no_undefined = -no-undefined
 export_symbols = -export-symbols $(srcdir)/gpgme.def
 
 install-def-file:
+       -$(INSTALL) -d $(DESTDIR)$(libdir)
        $(INSTALL) $(srcdir)/gpgme.def $(DESTDIR)$(libdir)/gpgme.def
 
 uninstall-def-file:
@@ -225,11 +202,7 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 endif
 
 noinst_PROGRAMS = gpgme-tool
-gpgme_tool_LDADD = libgpgme.la
-
-status-table.h : gpgme.h extra-stati.h
-       cat $(builddir)/gpgme.h $(srcdir)extra-stati.h \
-          | $(srcdir)/mkstatus  > status-table.h
+gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
 
 install-data-local: install-def-file