diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 17:30:32 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 17:30:32 +0100 |
| commit | 9a1151d6474ac7daebc263edc2f37caf3b4c9955 (patch) | |
| tree | d11965d58c2eb20c0470fc5f9c25de42ab545375 /tests/Makefile.am | |
| parent | 2ea5d49da27c3569251896884786649a72bd6df3 (diff) | |
| parent | 6b7407cb031cf245a4998d8c79009039ead38fc5 (diff) | |
| download | msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.tar.gz msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.tar.xz msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.zip | |
Merge branch 'pre-gsf'
Conflicts:
libmsi/Makefile.am
libmsi/libmsi-summary-info.c
libmsi/msipriv.h
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index b10049b..1c9af62 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. $(GLIB_CFLAGS) dist_noinst_HEADERS = test.h noinst_PROGRAMS = testrecord testdatabase |