diff options
author | Martin Szulecki | 2009-05-11 17:30:03 +0200 |
---|---|---|
committer | Martin Szulecki | 2009-05-11 17:30:03 +0200 |
commit | f671b8174d1c55a54e736aa73de385dd5d7e2cb9 (patch) | |
tree | 948a7e32d16a624371ad340da62686c710d9a2db | |
parent | e449f1b3699f356b4e3238ca287e371656c4136c (diff) | |
parent | 6c25d6104412dcbbc50096878c69f648aeae345d (diff) | |
download | libimobiledevice-f671b8174d1c55a54e736aa73de385dd5d7e2cb9.tar.gz libimobiledevice-f671b8174d1c55a54e736aa73de385dd5d7e2cb9.tar.bz2 |
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | swig/Makefile.am | 27 |
3 files changed, 24 insertions, 10 deletions
@@ -8,3 +8,4 @@ Paul Sladen Patrick Walton Zoltan Balaton Nikias Bassen +Todd Zullinger diff --git a/configure.ac b/configure.ac index 210105a..4f0fff2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,10 +2,10 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(libiphone, 0.1.0, nospam@nowhere.com) -AM_INIT_AUTOMAKE(libiphone, 0.9.1) +AC_INIT(libiphone, 0.9.1, nospam@nowhere.com) +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) AC_CONFIG_SRCDIR([src/]) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_LIBTOOL diff --git a/swig/Makefile.am b/swig/Makefile.am index 7f88b40..726014b 100644 --- a/swig/Makefile.am +++ b/swig/Makefile.am @@ -1,18 +1,31 @@ INCLUDES = -I$(top_srcdir)/include $(libplist_CFLAGS) -I$(includedir) -BUILT_SOURCES = $(srcdir)/iphone_wrap.c +BUILT_SOURCES = iphone_wrap.c SWIG_SOURCES = iphone.i +CLEANFILES = \ + *.pyc \ + *.pyo \ + _iPhone.so \ + iPhone.py \ + iphone_wrap.c + +EXTRA_DIST = \ + __init__.py \ + iphone.i + swigincludedir =$(includedir)/libiphone/swig swiginclude_HEADERS = $(SWIG_SOURCES) -pkgpython_PYTHON = iPhone.py __init__.py -pkgpyexec_LTLIBRARIES = _iPhone.la -_iPhone_la_SOURCES = $(srcdir)/iphone_wrap.c $(SWIG_SOURCES) +iPhonedir = $(pyexecdir)/libiphone +iPhone_PYTHON = __init__.py +nodist_iPhone_PYTHON = iPhone.py +iPhone_LTLIBRARIES = _iPhone.la +nodist__iPhone_la_SOURCES = iphone_wrap.c $(SWIG_SOURCES) _iPhone_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src -_iPhone_la_LDFLAGS = -module $(PYTHON_LDFLAGS) -_iPhone_la_LIBADD = ../src/libiphone.la +_iPhone_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) +_iPhone_la_LIBADD = $(top_builddir)/src/libiphone.la -$(srcdir)/iphone_wrap.c : $(SWIG_SOURCES) +iphone_wrap.c : $(SWIG_SOURCES) $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $< |