diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 11:35:57 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 11:38:05 +0100 |
| commit | cb4d4b7214170989fbce773bcf2dc0ca0581f4af (patch) | |
| tree | 43cad405aa6ae7bb8064f1be47cad94dc255ba5c /libmsi/Makefile.am | |
| parent | 4a33d8ff9f1e0593bd49922cd46aa3e6a7aa1273 (diff) | |
| parent | ae4c81e4fca5bb5816b5cbabb17a7dcc22f58a3b (diff) | |
| download | msitools-cb4d4b7214170989fbce773bcf2dc0ca0581f4af.tar.gz msitools-cb4d4b7214170989fbce773bcf2dc0ca0581f4af.tar.xz msitools-cb4d4b7214170989fbce773bcf2dc0ca0581f4af.zip | |
Merge branch 'pre-gsf'
Conflicts:
libmsi/Makefile.am
libmsi/handle.c
libmsi/libmsi-database.c
libmsi/libmsi-query.c
libmsi/libmsi-record.c
libmsi/libmsi-summary-info.c
libmsi/msipriv.h
Diffstat (limited to 'libmsi/Makefile.am')
| -rw-r--r-- | libmsi/Makefile.am | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am index e6f6677..afeefae 100644 --- a/libmsi/Makefile.am +++ b/libmsi/Makefile.am @@ -1,23 +1,41 @@ +NULL = lib_LTLIBRARIES = libmsi.la AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. \ - $(GLIB_CFLAGS) $(GSF_CFLAGS) + $(GLIB_CFLAGS) $(GSF_CFLAGS) $(GOBJECT_CFLAGS) AM_CFLAGS = -Wunused -Wimplicit AM_YFLAGS = -d BUILT_SOURCES = sql-parser.c sql-parser.h -noinst_HEADERS = \ - list.h \ - msipriv.h \ +noinst_HEADERS = \ + list.h \ + msipriv.h \ query.h -libmsi_la_SOURCES = libmsi-database.c libmsi-query.c libmsi-record.c \ - libmsi-summary-info.c alter.c create.c delete.c distinct.c \ - drop.c handle.c insert.c select.c storages.c streams.c \ - string.c table.c tokenize.c update.c where.c sql-parser.y +libmsi_la_SOURCES = \ + alter.c \ + create.c \ + delete.c \ + distinct.c \ + drop.c \ + insert.c \ + libmsi-database.c \ + libmsi-query.c \ + libmsi-record.c \ + libmsi-summary-info.c \ + select.c \ + sql-parser.y \ + storages.c \ + streams.c \ + string.c \ + table.c \ + tokenize.c \ + update.c \ + where.c \ + $(NULL) libmsi_la_LDFLAGS = -no-undefined -rpath $(libdir) \ -export-symbols-regex='^libmsi_' -libmsi_la_LIBADD = $(GLIB_LIBS) $(GSF_LIBS) +libmsi_la_LIBADD = $(GLIB_LIBS) $(GSF_LIBS) $(GOBJECT_LIBS) |