From 8bff2822c242d2878b408b9c0d8a7647108ea4b1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 1 Jan 2014 22:02:56 -0800 Subject: libaltos: Build -m64 and -m32 for fat tarball when possible Check to see if we can compile libaltos for both 32 bit and 64 bit systems, and then use those when generating the linux tarball. Signed-off-by: Keith Packard --- libaltos/Makefile.am | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'libaltos') diff --git a/libaltos/Makefile.am b/libaltos/Makefile.am index 831432fc..969aa8ad 100644 --- a/libaltos/Makefile.am +++ b/libaltos/Makefile.am @@ -5,8 +5,7 @@ AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6 altoslibdir=$(libdir)/altos altoslib_LTLIBRARIES=libaltos.la - -libaltos_la_LDFLAGS = -version-info 1:0:1 +libaltos_la_LDFLAGS=-version-info 1:0:1 libaltos_la_SOURCES=\ libaltos.c \ @@ -14,8 +13,35 @@ libaltos_la_SOURCES=\ noinst_PROGRAMS=cjnitest +cjnitest_SOURCES=cjnitest.c cjnitest_LDADD=libaltos.la +if MULTI_ARCH +altoslib_LTLIBRARIES+=libaltos32.la libaltos64.la + +libaltos32_la_LDFLAGS=$(libaltos_la_LDFLAGS) +libaltos64_la_LDFLAGS=$(libaltos_la_LDFLAGS) + +libaltos32_la_CFLAGS=-m32 $(AM_CFLAGS) +libaltos64_la_CFLAGS=-m64 $(AM_CFLAGS) + +libaltos32_la_SOURCES=$(libaltos_la_SOURCES) +libaltos64_la_SOURCES=$(libaltos_la_SOURCES) + +noinst_PROGRAMS+=cjnitest32 cjnitest64 + +cjnitest32_CFLAGS=-m32 +cjnitest64_CFLAGS=-m64 + +cjnitest32_SOURCES=$(cjnitest_SOURCES) +cjnitest64_SOURCES=$(cjnitest_SOURCES) + +cjnitest32_LDADD=libaltos32.la +cjnitest64_LDADD=libaltos64.la + +endif + + LIBS=-lbluetooth HFILES=libaltos.h -- cgit v1.2.3 From 9001d5780a41986017bd3bbc7f8c5556b116c351 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 15 Jan 2014 12:42:59 -0800 Subject: Ignore 32 and 64 bit cjnitest apps --- libaltos/.gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libaltos') diff --git a/libaltos/.gitignore b/libaltos/.gitignore index 6d043d60..20c3d47a 100644 --- a/libaltos/.gitignore +++ b/libaltos/.gitignore @@ -9,5 +9,7 @@ classlibaltos.stamp libaltos_wrap.c libaltosJNI cjnitest +cjnitest32 +cjnitest64 libaltos.swig swig_bindings/ -- cgit v1.2.3