From: Tae-Hwan Kim Date: Mon, 17 Jun 2013 04:54:58 +0000 (+0900) Subject: Fix makefile for making on jobs X-Git-Tag: accepted/tizen/20131029.210118~148 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8be991e767bd61b7eed9ff8b1210532a4d4942e;p=profile%2Fivi%2Fefl-theme-tizen.git Fix makefile for making on jobs Change-Id: I87f0f2eb08efb85c00165038438f2cd00d89a27f --- diff --git a/packaging/efl-theme-tizen-hd.spec b/packaging/efl-theme-tizen-hd.spec index 4a41c3e..e6b8a3c 100644 --- a/packaging/efl-theme-tizen-hd.spec +++ b/packaging/efl-theme-tizen-hd.spec @@ -5,7 +5,7 @@ Release: 1 Group: TO_BE/FILLED_IN License: APLv2 Source0: %{name}-%{version}.tar.gz -BuildRequires: edje, edje-bin, embryo, embryo-bin +BuildRequires: perl, edje, edje-bin, embryo, embryo-bin %define _unpackaged_files_terminate_build 0 %description diff --git a/themes/Makefile b/themes/Makefile index f630ddd..f4fae8b 100644 --- a/themes/Makefile +++ b/themes/Makefile @@ -5,7 +5,6 @@ THEME_DIR=$(DESTDIR)$(PREFIX)/share/elementary/themes EDJE_FLAGS_VERBOSE_ = EDJE_FLAGS_VERBOSE_0 = EDJE_FLAGS_VERBOSE_1 = -v -TMP_INC=tmp-inc.edc SRC=tizen TARGET=HD @@ -14,11 +13,7 @@ all: light dark .SUFFIXES: .edc .edj .edc.edj: - echo $(SRC) - echo $(EDJE_FLAGS_$(V)) - echo "/inc/$(@:.edj=)" - echo $(TARGET)/$(SRC)-$(TARGET)-$(@:.edj=) - cp -f ./inc/$(SRC)-$(@:.edj=-inc.edc) ./inc/$(TMP_INC) + perl -pi -e 's/TIZEN_TMP_INC/".\/inc\/$(SRC)-$*-inc.edc"/g' $*.edc edje_cc $(EDJE_FLAGS_$(V))\ -id ./images/$(TARGET)/$(@:.edj=)\ -id ./images/$(TARGET)/$(@:.edj=)/Content_views\ @@ -38,9 +33,8 @@ all: light dark -id ./images/$(TARGET)/$(@:.edj=)/Popup\ -id ./images/$(TARGET)/$(@:.edj=)/Process\ -id ./images/$(TARGET)/$(@:.edj=)/Screen_Reader\ - -sd ./sounds -fd ../objects $(SRC).edc \ - $(SRC)-$(TARGET)-$@ - rm -rf ./inc/tmp-inc.edc + -sd ./sounds -fd ../objects \ + $*.edc $(SRC)-$(TARGET)-$@ light: light.edj dark: dark.edj @@ -58,4 +52,3 @@ uninstall: rm -f $(EDC_DIR)/$(SRC.edc) && rm -rf $(EDC_DIR)/widgets distclean: clean - ~ diff --git a/themes/tizen.edc b/themes/tizen.edc index d7c5df4..1b6a157 100644 --- a/themes/tizen.edc +++ b/themes/tizen.edc @@ -26,7 +26,7 @@ // have zero restrictions on using this file as a base for your theme. // theme configuration file for each theme (tizen, tizen-black, ...) -#include "inc/tmp-inc.edc" +#include TIZEN_TMP_INC #define INDICATOR_H 27 #define CONTROLBAR_LARGE_H 78