diff options
| author |  Jonathan Beck | 2009-03-16 21:40:33 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-03-16 21:40:33 +0100 |
| commit | 19992c668afeb53a28e08a1f61572b5379f87590 (patch) | |
| tree | 4f1784b81afe88a6240889961b5fc3d2b0d6a82e /dev/Makefile.am | |
| parent | 0d05f8de79ee91e9be80c6296eff9ce216582ba4 (diff) | |
| parent | 201e1ff5bf2054fcb1c0cc3cd7ba1e229dbde3fa (diff) | |
| download | libimobiledevice-19992c668afeb53a28e08a1f61572b5379f87590.tar.gz libimobiledevice-19992c668afeb53a28e08a1f61572b5379f87590.tar.bz2 | |
Merge branch 'master' into contact_sync
Conflicts:
configure.ac
dev/Makefile.am
include/libiphone/libiphone.h
src/AFC.c
src/AFC.h
src/Makefile.am
Diffstat (limited to 'dev/Makefile.am')
| -rw-r--r-- | dev/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dev/Makefile.am b/dev/Makefile.am index f976ccc..f7d1109 100644 --- a/dev/Makefile.am +++ b/dev/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir)/include -AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) -g +AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(LFS_CFLAGS) AM_LDFLAGS = $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) bin_PROGRAMS = iphoneclient lckd-client afccheck msyncclient @@ -22,3 +22,4 @@ msyncclient_SOURCES = msyncclient.c msyncclient_CFLAGS = $(AM_CFLAGS) msyncclient_LDFLAGS = $(AM_LDFLAGS) msyncclient_LDADD = ../src/libiphone.la + |