diff options
| author | Simon Busch <morphis@gravedo.de> | 2012-01-28 15:07:24 +0100 |
|---|---|---|
| committer | Simon Busch <morphis@gravedo.de> | 2012-01-28 15:07:24 +0100 |
| commit | 51ea3aaa63e65b74b7386fe1365d7b52f4495c43 (patch) | |
| tree | 7946a90808a3ac0e3ad1c8cddadab7a0035c5e83 | |
| parent | a6fab223402276cd543830be051ff7ef8bae8b4f (diff) | |
| download | hardware_replicant_libsamsung-ipc-51ea3aaa63e65b74b7386fe1365d7b52f4495c43.tar.gz hardware_replicant_libsamsung-ipc-51ea3aaa63e65b74b7386fe1365d7b52f4495c43.tar.bz2 hardware_replicant_libsamsung-ipc-51ea3aaa63e65b74b7386fe1365d7b52f4495c43.zip | |
Adjust to get everything compiling with autotools again
Signed-off-by: Simon Busch <morphis@gravedo.de>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | include/Makefile.am | 14 | ||||
| -rw-r--r-- | include/types.h | 1 | ||||
| -rw-r--r-- | samsung-ipc/Makefile.am | 11 | ||||
| -rw-r--r-- | tools/Makefile.am | 8 |
5 files changed, 12 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 1f7d4c1..d0241ed 100644 --- a/configure.ac +++ b/configure.ac @@ -25,9 +25,8 @@ PKG_PROG_PKG_CONFIG # protocol version we're building for AC_ARG_WITH(protocol-version, [ --with-protocol-version=NAME Version of the IPC protocol we're building libsamsung-ipc for], - [v=$withval;protocol_version=$v], [protocol_version=crespo]) -AM_CONDITIONAL([WANT_PROTOCOL_VERISON_CRESPO], [test x"$protocol_version" = x"crespo"]) -AM_CONDITIONAL([WANT_PROTOCOL_VERISON_H1], [test x"$protocol_version" = x"h1"]) + [v=$withval;protocol_version=$v], [protocol_version=4]) +AM_CONDITIONAL([WANT_PROTOCOL_VERISON_4], [test x"$protocol_version" = x"4"]) #------------------------------------------------------------------------------ # openssl diff --git a/include/Makefile.am b/include/Makefile.am index 4595c40..0c2b04e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -27,11 +27,11 @@ samsung_ipc_h1include_HEADERS = \ device/h1/gen.h $(NULL) -samsung_ipc_crespoincludedir = $(includedir)/samsung-ipc-1.0/device/crespo/ -samsung_ipc_crespoinclude_HEADERS = \ - device/crespo/call.h \ - device/crespo/net.h \ - device/crespo/sms.h \ - device/crespo/misc.h \ - device/crespo/gen.h \ +samsung_ipc_v4includedir = $(includedir)/samsung-ipc-1.0/device/ipc-v4/ +samsung_ipc_v4include_HEADERS = \ + device/ipc-v4/call.h \ + device/ipc-v4/net.h \ + device/ipc-v4/sms.h \ + device/ipc-v4/misc.h \ + device/ipc-v4/gen.h \ $(NULL) diff --git a/include/types.h b/include/types.h index 2a39af7..fa04fad 100644 --- a/include/types.h +++ b/include/types.h @@ -32,6 +32,7 @@ #include "rfs.h" #include "snd.h" #include "gprs.h" +#include "ss.h" /* AP -> Baseband */ #define IPC_TYPE_EXEC 0x01 diff --git a/samsung-ipc/Makefile.am b/samsung-ipc/Makefile.am index d21c172..46e4e6c 100644 --- a/samsung-ipc/Makefile.am +++ b/samsung-ipc/Makefile.am @@ -29,19 +29,10 @@ libsamsung_ipc_la_SOURCES = \ sms.c \ $(NULL) -if WANT_PROTOCOL_VERISON_CRESPO libsamsung_ipc_la_SOURCES += \ device/crespo/crespo_ipc.c \ $(NULL) -AM_CFLAGS += -DDEVICE_CRESPO -endif - -if WANT_PROTOCOL_VERISON_H1 -libsamsung_ipc_la_SOURCES += \ - device/h1/h1_ipc.c \ - $(NULL) -AM_CFLAGS += -DDEVICE_H1 -endif +AM_CFLAGS += -DDEVICE_IPC_V4 libsamsung_ipc_la_LIBADD = \ $(OPENSSL_LIBS) \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 732d27f..b320ef1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,13 +4,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/include \ $(NULL) -if WANT_PROTOCOL_VERISON_CRESPO -AM_CFLAGS += -DDEVICE_CRESPO -endif - -if WANT_PROTOCOL_VERISON_H1 -AM_CFLAGS += -DDEVICE_H1 -endif +AM_CFLAGS += -DDEVICE_IPC_V4 bin_PROGRAMS = \ modemctrl \ |