Cleanup build system and directory structure

.gitignore

@@ -1,5 +1,4 @@
 *.o
-*.so
 cscope.out
 tags
 out

config.mk

@@ -0,0 +1,45 @@
+# Latehooks (experimental)
+LATEHOOKS ?= 1
+
+# Debug build (logging + debug symbols)
+DEBUG ?= 0
+
+# Destination directory when installing (used for packaging)
+DESTDIR ?= /
+
+# Destination prefix when installing
+PREFIX ?= /usr
+
+# Target platform
+PLATFORM ?= harmattan
+
+# Set to 1 for verbose compile output
+V ?= 0
+
+# Default linker flags
+LDFLAGS += -fPIC -pthread -ldl -lz -lpng -ljpeg
+
+
+ifeq ($(LATEHOOKS),1)
+    CFLAGS += -DAPKENV_LATEHOOKS
+endif
+
+ifeq ($(DEBUG),1)
+    CFLAGS += -g -Wall -DLINKER_DEBUG=1 -DAPKENV_DEBUG -Wformat=0
+else
+    CFLAGS += -O2 -DLINKER_DEBUG=0
+endif
+
+ifeq ($(V),1)
+    SILENTMSG := @true
+    SILENTCMD :=
+else
+    SILENTMSG := @echo
+    SILENTCMD := @
+endif
+
+
+# Expose some makefile variables as C macros
+CFLAGS += -DAPKENV_PREFIX=\"$(PREFIX)\"
+CFLAGS += -DAPKENV_TARGET=\"$(TARGET)\"
+CFLAGS += -DAPKENV_PLATFORM=\"$(PLATFORM)\"

linker/linker.c

@@ -610,21 +610,14 @@ static void dump(soinfo *si)
 
 #define SOPATH_MAX 8
 
-#if defined(PANDORA)
-static const char *sopaths[SOPATH_MAX + 1] = {
-    "./vendor/lib",
-    "./system/lib",
-    "./lib",
-};
-#else
 static const char *sopaths[SOPATH_MAX + 1] = {
     "/vendor/lib",
     "/system/lib",
-    "/opt/apkenv/bionic/",
-    // Also allow local directory during development
-    "./libs/",
-};
+    APKENV_PREFIX "/lib/" APKENV_TARGET "/bionic/",
+#ifdef APKENV_LOCAL_BIONIC_PATH
+    APKENV_LOCAL_BIONIC_PATH,
 #endif
+};
 
 int add_sopath(const char *path)
 {
@@ -1755,7 +1748,7 @@ static int nullify_closed_stdio (void)
 void wrap_function(void *sym_addr, char *sym_name, int is_thumb, soinfo *si)
 {
     void *hook = NULL;
-#ifdef LATEHOOKS
+#ifdef APKENV_LATEHOOKS
     if((hook = get_hooked_symbol(sym_name, 0)) != NULL)
     {
         // if we have a hook redirect the call to that by overwriting
@@ -1788,7 +1781,7 @@ void wrap_function(void *sym_addr, char *sym_name, int is_thumb, soinfo *si)
         }
     }
     else
-#endif /* LATEHOOKS */
+#endif /* APKENV_LATEHOOKS */
     // TODO: this will fail if the first 2 instructions do something pc related
     // (this DOES NOT happen very often)
     if(sym_addr && !is_thumb)

makefile

@@ -1,141 +1,63 @@
+TARGET := apkenv
 
-# Android Gingerbread linker
-LINKER_SOURCES=$(wildcard linker/*.c)
+# Default target, make sure this is always first
+all: $(TARGET) modules
 
-# Compatibility wrappers and hooks
-COMPAT_SOURCES=$(wildcard compat/*.c)
+# Build configuration
+include config.mk
 
-# Library for getting files out of .apk files
-APKLIB_SOURCES=$(wildcard apklib/*.c)
+SOURCES := $(TARGET).c
+SOURCES += $(wildcard linker/*.c)
+SOURCES += $(wildcard compat/*.c)
+SOURCES += $(wildcard apklib/*.c)
+SOURCES += $(wildcard jni/*.c)
+SOURCES += $(wildcard imagelib/*.c)
+SOURCES += $(wildcard debug/*.c)
+SOURCES += $(wildcard debug/wrappers/*.c)
 
-# Our own JNI environment implementation
-JNIENV_SOURCES=$(wildcard jni/*.c)
+# Platform-specific targets and configuration
+PLATFORM_INSTALL_TARGETS :=
+include platform/$(PLATFORM).mk
 
-# Support modules for specific applications
-MODULES_SOURCES=$(wildcard modules/*.c)
-
-# JPEG and PNG loaders
-IMAGELIB_SOURCES=$(wildcard imagelib/*.c)
-
-# segfault catch
-DEBUG_SOURCES=$(wildcard debug/*.c)
-
-# debug wrappers
-WRAPPER_SOURCES=$(wildcard debug/wrappers/*.c)
-
-TARGET = apkenv
-
-# we need objdump for getting a disassembly of the debug-wrappers
-OBJDUMP ?= objdump
-
-# enable latehooks
-LATEHOOKS ?= 1
-
-ifeq ($(LATEHOOKS),1)
-	CFLAGS += -DLATEHOOKS
-endif
-
-DESTDIR ?= /
-PREFIX ?= /opt/$(TARGET)/
-BIONIC_LIBS = $(wildcard libs/*.so)
-
-SOURCES += $(TARGET).c
-SOURCES += $(LINKER_SOURCES)
-SOURCES += $(COMPAT_SOURCES)
-SOURCES += $(APKLIB_SOURCES)
-SOURCES += $(JNIENV_SOURCES)
-SOURCES += $(IMAGELIB_SOURCES)
-SOURCES += $(DEBUG_SOURCES)
-SOURCES += $(WRAPPER_SOURCES)
-
-PANDORA ?= 0
-ifeq ($(PANDORA),1)
-SOURCES += platform/pandora.c
-else
-SOURCES += platform/maemo.c
-endif
+OBJS := $(patsubst %.c,%.o,$(SOURCES))
 
-OBJS = $(patsubst %.c,%.o,$(SOURCES))
-MODULES = $(patsubst modules/%.c,%.apkenv.so,$(MODULES_SOURCES))
-
-LDFLAGS = -fPIC -ldl -lz -lSDL -lSDL_mixer -pthread -lpng -ljpeg
-
-ifeq ($(PANDORA),1)
-CFLAGS += -DPANDORA
-LDFLAGS += -lrt
-endif
-
-# Selection of OpenGL ES version support (if any) to include
-CFLAGS += -DAPKENV_GLES
-LDFLAGS += -lGLES_CM
-CFLAGS += -DAPKENV_GLES2
-LDFLAGS += -lGLESv2 -lEGL
-
-FREMANTLE ?= 0
-ifeq ($(FREMANTLE),1)
-    CFLAGS += -DFREMANTLE
-    LDFLAGS += -lSDL_gles
-endif
+# Support modules for specific applications
+MODULES_SOURCES := $(wildcard modules/*.c)
+MODULES := $(patsubst modules/%.c,%.apkenv.so,$(MODULES_SOURCES))
 
-DEBUG ?= 0
-ifeq ($(DEBUG),1)
-    CFLAGS += -g -Wall -DLINKER_DEBUG=1 -DAPKENV_DEBUG -Wformat=0
-else
-    CFLAGS += -O2 -DLINKER_DEBUG=0
-endif
+modules: $(MODULES)
 
-all: $(TARGET) $(MODULES)
+$(TARGET): $(OBJS)
+	$(SILENTMSG) -e "\tLINK\t$@"
+	$(SILENTCMD)$(CC) $(LDFLAGS) $(OBJS) -o $@
 
 debug/wrappers/%_thumb.o: debug/wrappers/%_thumb.c
-	@echo -e "\tCC (TH)\t$@"
-	@$(CC) -mthumb -O0 -c -o $@ $<
+	$(SILENTMSG) -e "\tCC (TH)\t$@"
+	$(SILENTCMD)$(CC) -mthumb -O0 -c -o $@ $<
 
 debug/wrappers/%_arm.o: debug/wrappers/%_arm.c
-	@echo -e "\tCC\t$@"
-	@$(CC) -marm -O0 -c -o $@ $<
+	$(SILENTMSG) -e "\tCC\t$@"
+	$(SILENTCMD)$(CC) -marm -O0 -c -o $@ $<
 
 %.o: %.c
-	@echo -e "\tCC\t$@"
-	@$(CC) $(CFLAGS) -c -o $@ $<
-
-$(TARGET): $(OBJS)
-	@echo -e "\tLINK\t$@"
-	@$(CC) $(LDFLAGS) $(OBJS) -o $@
+	$(SILENTMSG) -e "\tCC\t$@"
+	$(SILENTCMD)$(CC) $(CFLAGS) -c -o $@ $<
 
 %.apkenv.so: modules/%.c
-	@echo -e "\tMOD\t$@"
-	@$(CC) -fPIC -shared $(CFLAGS) -o $@ $<
+	$(SILENTMSG) -e "\tMOD\t$@"
+	$(SILENTCMD)$(CC) -fPIC -shared $(CFLAGS) -o $@ $<
 
-strip:
-	@echo -e "\tSTRIP"
-	@strip $(TARGET) $(MODULES)
-
-install: $(TARGET) $(MODULES)
-	@echo -e "\tMKDIR"
-	@mkdir -p $(DESTDIR)$(PREFIX)/{modules,bionic}
-	@mkdir -p $(DESTDIR)/usr/bin
-	@echo -e "\tINSTALL\t$(TARGET)"
-	@install -m755 $(TARGET) $(DESTDIR)/usr/bin
-	@echo -e "\tINSTALL\tMODULES"
-	@install -m644 $(MODULES) $(DESTDIR)$(PREFIX)/modules
-ifneq ($(PANDORA),1)
-	@echo -e "\tINSTALL\tBIONIC"
-	@install -m644 $(BIONIC_LIBS) $(DESTDIR)$(PREFIX)/bionic
-ifneq ($(FREMANTLE),1)
-	@echo -e "\tINSTALL\tHarmattan Resource Policy"
-	@install -d -m755 $(DESTDIR)/usr/share/policy/etc/syspart.conf.d
-	@install -m644 $(TARGET).conf $(DESTDIR)/usr/share/policy/etc/syspart.conf.d
-endif
-else
-	@echo -e "\tINSTALL\tlibs"
-	@mkdir -p $(DESTDIR)$(PREFIX)/system/lib
-	@install -m644 libs/pandora/system/lib/*.so $(DESTDIR)$(PREFIX)/system/lib/
-endif
+install: $(TARGET) $(MODULES) $(PLATFORM_INSTALL_TARGETS)
+	$(SILENTMSG) -e "\tINSTALL\t$(TARGET)"
+	$(SILENTCMD)mkdir -p $(DESTDIR)$(PREFIX)/bin
+	$(SILENTCMD)install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
+	$(SILENTMSG) -e "\tINSTALL\tMODULES"
+	$(SILENTCMD)mkdir -p $(DESTDIR)$(PREFIX)/lib/$(TARGET)/modules
+	$(SILENTCMD)install -m644 $(MODULES) $(DESTDIR)$(PREFIX)/lib/$(TARGET)/modules
 
 clean:
-	@echo -e "\tCLEAN"
-	@rm -rf $(TARGET) $(OBJS) $(MODULES)
+	$(SILENTMSG) -e "\tCLEAN"
+	$(SILENTCMD)rm -rf $(TARGET) $(OBJS) $(MODULES)
 
 .DEFAULT: all
-.PHONY: strip install clean
-
+.PHONY: all modules install clean