Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix makefiles

Browse source
This commit is contained in:
Alexey Pelykh 2012-06-16 09:14:34 +03:00
parent 0f8a405f15
commit b340f83e15
3 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Osmand-kernel/Makefile.rules
View file

@ -12,8 +12,8 @@ CFLAGS_debug := -g -O0
CXXFLAGS_release := -O2 CXXFLAGS_release := -O2
CFLAGS_release := -O2 CFLAGS_release := -O2
# Get the build type OUTPUT_DIR_PREFIX = ../lib/$(TARGET)-$(ARCH)
PREBUILT_DIR_PREFIX = ../lib/$(TARGET)-$(ARCH) BUILD_DIR_PREFIX = ../build/$(TARGET)-$(ARCH)
OBJECTS_NAMES = $(foreach sourceFilesExt,$(CC_SOURCE_FILES_EXTS), \ OBJECTS_NAMES = $(foreach sourceFilesExt,$(CC_SOURCE_FILES_EXTS), \
$(patsubst %.$(sourceFilesExt),%.$(sourceFilesExt).cc.o,$(filter %.$(sourceFilesExt),$(LOCAL_SRC_FILES))) \ $(patsubst %.$(sourceFilesExt),%.$(sourceFilesExt).cc.o,$(filter %.$(sourceFilesExt),$(LOCAL_SRC_FILES))) \
@ -22,20 +22,20 @@ OBJECTS_NAMES = $(foreach sourceFilesExt,$(CC_SOURCE_FILES_EXTS), \
) )
OBJECTS = $(addprefix obj-$(TARGET)-$(ARCH)/,$(OBJECTS_NAMES)) OBJECTS = $(addprefix obj-$(TARGET)-$(ARCH)/,$(OBJECTS_NAMES))
# Declare phony targets
.PHONY: release debug clean installr installd install-release-$(DYNAMICLIB_EXT) install-debug-$(DYNAMICLIB_EXT) install-release-$(STATICLIB_EXT) install-debug-$(STATICLIB_EXT)
# Default target # Default target
.DEFAULT: installr .DEFAULT: installr
# Declare phony targets
.PHONY: release debug clean installr installd
# Precious targets # Precious targets
.PRECIOUS: build-release/$(LIBNAME).$(LIBTYPE) build-debug/$(LIBNAME).$(LIBTYPE) $(addprefix build-release/,$(OBJECTS)) $(addprefix build-debug/,$(OBJECTS)) .PRECIOUS: build-release/$(LIBNAME).$(LIBTYPE) build-debug/$(LIBNAME).$(LIBTYPE) $(addprefix build-release/,$(OBJECTS)) $(addprefix build-debug/,$(OBJECTS))
# Route build targets properly # Route build targets properly
installr: install-release installr: release $(OUTPUT_DIR_PREFIX)-release/$(LIBNAME).$(LIBTYPE)
installd: install-debug installd: debug $(OUTPUT_DIR_PREFIX)-debug/$(LIBNAME).$(LIBTYPE)
release: build-release/$(TARGET)-$(ARCH)/$(LIBNAME).$(LIBTYPE) release: $(BUILD_DIR_PREFIX)-release/$(LIBNAME).$(LIBTYPE)
debug: build-debug/$(TARGET)-$(ARCH)/$(LIBNAME).$(LIBTYPE) debug: $(BUILD_DIR_PREFIX)-debug/$(LIBNAME).$(LIBTYPE)
# Clean removes all objects # Clean removes all objects
clean: clean:
@ -43,12 +43,17 @@ clean:
$(RM) -r build-debug/obj-$(TARGET)-$(ARCH)/ $(RM) -r build-debug/obj-$(TARGET)-$(ARCH)/
$(RM) -r build-release/$(TARGET)-$(ARCH) $(RM) -r build-release/$(TARGET)-$(ARCH)
$(RM) -r build-debug/$(TARGET)-$(ARCH) $(RM) -r build-debug/$(TARGET)-$(ARCH)
$(RM) $(PREBUILT_DIR_PREFIX)/$(LIBNAME).$(LIBTYPE) $(RM) -r $(BUILD_DIR_PREFIX)-release
$(RM) -r $(BUILD_DIR_PREFIX)-debug
$(RM) $(OUTPUT_DIR_PREFIX)-release/$(LIBNAME).$(LIBTYPE)
$(RM) $(OUTPUT_DIR_PREFIX)-debug/$(LIBNAME).$(LIBTYPE)
# This target copies final output file to prebuilt folder # This target copies final output file to output directory
install-%: % $(OUTPUT_DIR_PREFIX)-%/$(LIBNAME).$(DYNAMICLIB_EXT): $(BUILD_DIR_PREFIX)-%/$(LIBNAME).$(LIBTYPE)
@mkdir -p $(PREBUILT_DIR_PREFIX)-$* @mkdir -p $(OUTPUT_DIR_PREFIX)-$*
cp build-$*/$(TARGET)-$(ARCH)/$(LIBNAME).$(LIBTYPE) $(PREBUILT_DIR_PREFIX)-$*/$(LIBNAME).$(LIBTYPE) cp $(BUILD_DIR_PREFIX)-$*/$(LIBNAME).$(LIBTYPE) $(OUTPUT_DIR_PREFIX)-$*/$(LIBNAME).$(LIBTYPE)
$(OUTPUT_DIR_PREFIX)-%/$(LIBNAME).$(STATICLIB_EXT):
# Builds source files using CC compiler # Builds source files using CC compiler
build-release/obj-$(TARGET)-$(ARCH)/%.cc.o : % $(LOCAL_C_INCLUDES) build-release/obj-$(TARGET)-$(ARCH)/%.cc.o : % $(LOCAL_C_INCLUDES)
@ -76,4 +81,9 @@ build-%/$(TARGET)-$(ARCH)/$(LIBNAME).$(STATICLIB_EXT): $$(addprefix build-%/,$(O
.SECONDEXPANSION: .SECONDEXPANSION:
build-%/$(TARGET)-$(ARCH)/$(LIBNAME).$(DYNAMICLIB_EXT): $$(addprefix build-%/,$(OBJECTS)) build-%/$(TARGET)-$(ARCH)/$(LIBNAME).$(DYNAMICLIB_EXT): $$(addprefix build-%/,$(OBJECTS))
@mkdir -p `dirname $@` @mkdir -p `dirname $@`
$(CXX) -o $@ $(addprefix build-$*/,$(OBJECTS)) $(LDFLAGS) -L$(PREBUILT_DIR_PREFIX)-$* $(LDLIBS) $(CXX) -o $@ $(addprefix build-$*/,$(OBJECTS)) $(LDFLAGS) -L$(BUILD_DIR_PREFIX)-$* $(LDLIBS)
# This is for copying binary files to build directory
$(BUILD_DIR_PREFIX)-%/$(LIBNAME).$(LIBTYPE): build-%/$(TARGET)-$(ARCH)/$(LIBNAME).$(LIBTYPE)
@mkdir -p $(BUILD_DIR_PREFIX)-$*
cp build-$*/$(TARGET)-$(ARCH)/$(LIBNAME).$(LIBTYPE) $(BUILD_DIR_PREFIX)-$*/$(LIBNAME).$(LIBTYPE)

2
Osmand-kernel/build/.gitignore vendored Executable file
View file

@ -0,0 +1,2 @@
*
!.gitignore

2
Osmand-kernel/expat/Common.mk
View file

@ -6,7 +6,7 @@ LOCAL_C_INCLUDES += \
$(OSMAND_EXPAT_ABS) \ $(OSMAND_EXPAT_ABS) \
$(OSMAND_EXPAT_ABS)/lib $(OSMAND_EXPAT_ABS)/lib
LOCAL_CFLAGS += -fPIC -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H LOCAL_CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(OSMAND_EXPAT_LOC)/lib/xmlparse.c \ $(OSMAND_EXPAT_LOC)/lib/xmlparse.c \