diff options
| author |  Martin Szulecki | 2009-05-24 00:25:03 +0200 |
|---|---|---|
| committer | Martin Szulecki | 2009-05-24 00:25:03 +0200 |
| commit | 36ea32e0064f33d6a285684c3069f4d75bbac7a8 (patch) | |
| tree | 039291b47e954fe8529f52e1fc71f7e924761a6a /dev/Makefile.am | |
| parent | 46f8d46845355e6a33a6dcb97ba11d4c4cab62eb (diff) | |
| parent | 435f5feb4b5c501db52743a170908687d3ba6f60 (diff) | |
| download | libimobiledevice-36ea32e0064f33d6a285684c3069f4d75bbac7a8.tar.gz libimobiledevice-36ea32e0064f33d6a285684c3069f4d75bbac7a8.tar.bz2 | |
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
Conflicts:
src/Makefile.am
Diffstat (limited to 'dev/Makefile.am')
| -rw-r--r-- | dev/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dev/Makefile.am b/dev/Makefile.am index 8afe2f9..9e06339 100644 --- a/dev/Makefile.am +++ b/dev/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = -I$(top_srcdir)/include -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) +AM_CFLAGS = $(GLOBAL_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(LFS_CFLAGS) +AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) -bin_PROGRAMS = iphoneclient lckd-client afccheck msyncclient iphoneinfo iphonesyslog +bin_PROGRAMS = iphoneclient lckd-client afccheck msyncclient iphoneinfo iphonesyslog iphone_id iphoneclient_SOURCES = main.c iphoneclient_LDADD = ../src/libiphone.la @@ -32,3 +32,8 @@ iphonesyslog_SOURCES = syslog_relay.c iphonesyslog_CFLAGS = $(AM_CFLAGS) iphonesyslog_LDFLAGS = $(AM_LDFLAGS) iphonesyslog_LDADD = ../src/libiphone.la + +iphone_id_SOURCES = iphone_id.c +iphone_id_CFLAGS = $(AM_CFLAGS) +iphone_id_LDFLAGS = $(AM_LDFLAGS) +iphone_id_LDADD = ../src/libiphone.la |