From d8531a3a7cc0e873b895246d16db9ad6ef15d93b Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 10 Aug 2012 12:12:18 +0200 Subject: [PATCH] simplify makefiles --- Android.mk | 5 ----- Generic.mk | 11 ++++------- Linux.mk | 5 ----- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Android.mk b/Android.mk index 8e6007f..dc4a4af 100644 --- a/Android.mk +++ b/Android.mk @@ -1,9 +1,4 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) # load the common sources file of the platform include $(LOCAL_PATH)/Generic.mk - -LOCAL_CFLAGS += -D__PLATFORM__Android - -include $(BUILD_STATIC_LIBRARY) diff --git a/Generic.mk b/Generic.mk index ecd729f..cbd2677 100644 --- a/Generic.mk +++ b/Generic.mk @@ -1,3 +1,5 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) # name of the librairy LOCAL_MODULE := agg @@ -17,16 +19,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -ifeq ($(DEBUG),1) -LOCAL_CFLAGS := -DAGG_DEBUG_LEVEL=3 \ - -DAGG_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" -else -LOCAL_CFLAGS := -DAGG_DEBUG_LEVEL=3 \ - -DAGG_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" -endif +LOCAL_CFLAGS := -DAGG_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" # load the common sources file of the platform include $(LOCAL_PATH)/file.mk LOCAL_SRC_FILES := $(FILE_LIST) +include $(BUILD_STATIC_LIBRARY) diff --git a/Linux.mk b/Linux.mk index 5eaa2d8..dc4a4af 100644 --- a/Linux.mk +++ b/Linux.mk @@ -1,9 +1,4 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) # load the common sources file of the platform include $(LOCAL_PATH)/Generic.mk - -LOCAL_CFLAGS += -D__PLATFORM__Linux - -include $(BUILD_STATIC_LIBRARY)