From 5fc5d37330d3535a0f421632694d1e7918fc22d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 11:38:09 +0200 Subject: Compiles correctly: app/build-native + gradle. --- app/lzo/minilzo/Makefile.am | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 app/lzo/minilzo/Makefile.am (limited to 'app/lzo/minilzo/Makefile.am') diff --git a/app/lzo/minilzo/Makefile.am b/app/lzo/minilzo/Makefile.am new file mode 100644 index 00000000..4b3693c9 --- /dev/null +++ b/app/lzo/minilzo/Makefile.am @@ -0,0 +1,14 @@ +## Process this file with automake to create Makefile.in +# +# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer +# + +AM_CPPFLAGS = -DMINILZO_HAVE_CONFIG_H +INCLUDES = -I$(top_srcdir)/include/lzo -I$(top_srcdir)/include + +noinst_PROGRAMS = testmini + +testmini_SOURCES = testmini.c minilzo.c + +EXTRA_DIST = README.LZO Makefile.minilzo minilzo.h + -- cgit v1.2.3 From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 12:04:17 +0200 Subject: Rename app->bitmask_android This way, gradle commands generate apks correctly named. --- app/lzo/minilzo/Makefile.am | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 app/lzo/minilzo/Makefile.am (limited to 'app/lzo/minilzo/Makefile.am') diff --git a/app/lzo/minilzo/Makefile.am b/app/lzo/minilzo/Makefile.am deleted file mode 100644 index 4b3693c9..00000000 --- a/app/lzo/minilzo/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -# -# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer -# - -AM_CPPFLAGS = -DMINILZO_HAVE_CONFIG_H -INCLUDES = -I$(top_srcdir)/include/lzo -I$(top_srcdir)/include - -noinst_PROGRAMS = testmini - -testmini_SOURCES = testmini.c minilzo.c - -EXTRA_DIST = README.LZO Makefile.minilzo minilzo.h - -- cgit v1.2.3 From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 9 Apr 2014 16:03:55 +0200 Subject: Back to the standard "app" module. This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure I'll have to tweak the final apk name in build.gradle. --- app/lzo/minilzo/Makefile.am | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 app/lzo/minilzo/Makefile.am (limited to 'app/lzo/minilzo/Makefile.am') diff --git a/app/lzo/minilzo/Makefile.am b/app/lzo/minilzo/Makefile.am new file mode 100644 index 00000000..4b3693c9 --- /dev/null +++ b/app/lzo/minilzo/Makefile.am @@ -0,0 +1,14 @@ +## Process this file with automake to create Makefile.in +# +# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer +# + +AM_CPPFLAGS = -DMINILZO_HAVE_CONFIG_H +INCLUDES = -I$(top_srcdir)/include/lzo -I$(top_srcdir)/include + +noinst_PROGRAMS = testmini + +testmini_SOURCES = testmini.c minilzo.c + +EXTRA_DIST = README.LZO Makefile.minilzo minilzo.h + -- cgit v1.2.3