diff options
| author | Keith Packard <keithp@keithp.com> | 2015-07-11 22:31:47 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-07-11 22:31:47 -0700 |
| commit | 52dc7dc5a791f3e7e307ae11f5c6a20b5bf71ba6 (patch) | |
| tree | 26c57dc170e2f396a20a7c8055f800d4067bd52a | |
| parent | c4af5cb233013b35d6763f5adf8d11b47f847111 (diff) | |
altosdroid: Cleanup Makefile.am
Avoid re-creating library symlinks.
Make builds depend on resource files too.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosdroid/Makefile.am | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am index 52a2064b..26e14ee7 100644 --- a/altosdroid/Makefile.am +++ b/altosdroid/Makefile.am @@ -20,6 +20,10 @@ ZIPALIGN_B=$(SDK)/build-tools/*/zipalign JAVA_SRC_DIR=src/org/altusmetrum/AltosDroid EXT_LIBDIR=libs DRAWABLE_DIR=res/drawable +LAYOUT_DIR=res/layout +MENU_DIR=res/menu +VALUES_DIR=res/values +XML_DIR=res/xml ALTOSLIB_SRCDIR=../altoslib ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar @@ -40,19 +44,25 @@ DRAWABLES=\ $(DRAWABLE_DIR)/greenled.png \ $(DRAWABLE_DIR)/grayled.png -SRC=$(JAVA_SRC) $(DRAWABLES) +LAYOUTS=$(LAYOUT_DIR)/*.xml +MENUS=$(MENU_DIR)/*.xml +VALUES=$(VALUES_DIR)/*.xml +XMLS=$(XML_DIR)/*.xml + +RES=$(LAYOUTS) $(MENUS) $(VALUES) $(XMLS) + +SRC=$(JAVA_SRC) $(DRAWABLES) $(RES) all: $(all_target) .NOTPARALLEL: -$(EXT_LIBDIR): +$(ALTOSLIB): $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) mkdir -p $(EXT_LIBDIR) - -$(ALTOSLIB): $(EXT_LIBDIR) $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) cd $(EXT_LIBDIR) && ln -sf $(shell echo $(EXT_LIBDIR) | sed 's|[^/]\+|..|g')/$(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) . -$(SUPPORT_V4): $(EXT_LIBDIR) $(SUPPORT_V4_SRCDIR)/$(SUPPORT_V4_JAR) +$(SUPPORT_V4): $(SUPPORT_V4_SRCDIR)/$(SUPPORT_V4_JAR) + mkdir -p $(EXT_LIBDIR) cd $(EXT_LIBDIR) && ln -sf $(SUPPORT_V4_SRCDIR)/$(SUPPORT_V4_JAR) . $(GOOGLE_PLAY_SERVICES_LIB): $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB) |