[fusion-commits] A scheme interpreter embedded in a compiz plugin with wrappings for making useful scripts.: Changes to 'master' (ee47ce5c16fac24ac1c1ad56043d37ade7f797b5)
guillaume at server.beryl-project.org
guillaume at server.beryl-project.org
Wed Jul 11 00:30:48 CEST 2007
New commits:
commit ee47ce5c16fac24ac1c1ad56043d37ade7f797b5
Author: Guillaume Seguin <ixce at ed3n-m.(none)>
Date: Wed Jul 11 00:30:42 2007 +0200
* Update Makefile
Makefile | 151 ++++++++++++++++++++++++++++++++------------------------------
1 files changed, 78 insertions(+), 73 deletions(-)
Modified: fusion/plugins/compiz-scheme/Makefile
===================================================================
--- fusion/plugins/compiz-scheme/Makefile
+++ fusion/plugins/compiz-scheme/Makefile
@@ -44,6 +44,8 @@ endif
BUILDDIR = build
+ECHO = `which echo`
+
CC = gcc
LIBTOOL = libtool
INSTALL = install
@@ -53,24 +55,24 @@ BCOP = `pkg-config --variable=bin bcop`
CFLAGS = -g -Wall `pkg-config --cflags $(PKG_DEP) compiz ` $(CFLAGS_ADD)
LDFLAGS = `pkg-config --libs $(PKG_DEP) compiz ` $(LDFLAGS_ADD)
-POFILEDIR = $(shell if [ -n "$(PODIR)" ]; then echo $(PODIR); else echo ./po;fi )
+POFILEDIR = $(shell if [ -n "$(PODIR)" ]; then $(ECHO) $(PODIR); else $(ECHO) ./po;fi )
is-bcop-target := $(shell if [ -e $(PLUGIN).xml.in ]; then cat $(PLUGIN).xml.in | grep "useBcop=\"true\""; \
else if [ -e $(PLUGIN).xml ]; then cat $(PLUGIN).xml | grep "useBcop=\"true\""; fi; fi)
-trans-target := $(shell if [ -e $(PLUGIN).xml.in -o -e $(PLUGIN).xml ]; then echo $(BUILDDIR)/$(PLUGIN).xml;fi )
+trans-target := $(shell if [ -e $(PLUGIN).xml.in -o -e $(PLUGIN).xml ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml;fi )
-bcop-target := $(shell if [ -n "$(is-bcop-target)" ]; then echo $(BUILDDIR)/$(PLUGIN).xml; fi )
-bcop-target-src := $(shell if [ -n "$(is-bcop-target)" ]; then echo $(BUILDDIR)/$(PLUGIN)_options.c; fi )
-bcop-target-hdr := $(shell if [ -n "$(is-bcop-target)" ]; then echo $(BUILDDIR)/$(PLUGIN)_options.h; fi )
+bcop-target := $(shell if [ -n "$(is-bcop-target)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml; fi )
+bcop-target-src := $(shell if [ -n "$(is-bcop-target)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN)_options.c; fi )
+bcop-target-hdr := $(shell if [ -n "$(is-bcop-target)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN)_options.h; fi )
-gen-schemas := $(shell if [ -e $(PLUGIN).xml.in -o -e $(PLUGIN).xml -a -n "`pkg-config --variable=xsltdir compiz-gconf`" ]; then echo true; fi )
-schema-target := $(shell if [ -n "$(gen-schemas)" ]; then echo $(BUILDDIR)/$(PLUGIN).xml; fi )
-schema-output := $(shell if [ -n "$(gen-schemas)" ]; then echo $(BUILDDIR)/compiz-$(PLUGIN).schema; fi )
+gen-schemas := $(shell if [ -e $(PLUGIN).xml.in -o -e $(PLUGIN).xml -a -n "`pkg-config --variable=xsltdir compiz-gconf`" ]; then $(ECHO) true; fi )
+schema-target := $(shell if [ -n "$(gen-schemas)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml; fi )
+schema-output := $(shell if [ -n "$(gen-schemas)" ]; then $(ECHO) $(BUILDDIR)/compiz-$(PLUGIN).schema; fi )
ifeq ($(BUILD_GLOBAL),true)
- pkg-target := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" ]; then echo "$(BUILDDIR)/compiz-$(PLUGIN).pc"; fi )
- hdr-install-target := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" -a -e $(PLUGIN).h ]; then echo "$(PLUGIN).h"; fi )
+ pkg-target := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" ]; then $(ECHO) "$(BUILDDIR)/compiz-$(PLUGIN).pc"; fi )
+ hdr-install-target := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" -a -e $(PLUGIN).h ]; then $(ECHO) "$(PLUGIN).h"; fi )
endif
# find all the object files (including those from .moc.cpp files)
@@ -78,14 +80,17 @@ endif
c-objs := $(patsubst %.c,%.lo,$(shell find -name '*.c' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///'))
c-objs := $(filter-out $(bcop-target-src:.c=.lo),$(c-objs))
+h-files := $(shell find -name '*.h' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///')
+h-files += $(bcop-target-hdr)
+
all-c-objs := $(addprefix $(BUILDDIR)/,$(c-objs))
all-c-objs += $(bcop-target-src:.c=.lo)
# system include path parameter, -isystem doesn't work on old gcc's
-inc-path-param = $(shell if [ -z "`gcc --version | head -n 1 | grep ' 3'`" ]; then echo "-isystem"; else echo "-I"; fi)
+inc-path-param = $(shell if [ -z "`gcc --version | head -n 1 | grep ' 3'`" ]; then $(ECHO) "-isystem"; else $(ECHO) "-I"; fi)
# default color settings
-color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
+color := $(shell if [ $$TERM = "dumb" ]; then $(ECHO) "no"; else $(ECHO) "yes"; fi)
#
# Do it.
@@ -129,23 +134,23 @@ $(BUILDDIR)/%.xml: %.xml
$(BUILDDIR)/%.xml: %.xml.in
@if [ -d $(POFILEDIR) ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -e -n "\033[0;1;5mtranslate \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
+ $(ECHO) -e -n "\033[0;1;5mtranslate \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
else \
- echo "translate $< -> $@"; \
+ $(ECHO) "translate $< -> $@"; \
fi; \
intltool-merge -x -u $(POFILEDIR) $< $@ > /dev/null; \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mtranslate : \033[34m$< -> $@\033[0m"; \
+ $(ECHO) -e "\r\033[0mtranslate : \033[34m$< -> $@\033[0m"; \
fi; \
else \
if [ '$(color)' != 'no' ]; then \
- echo -e -n "\033[0;1;5mconvert \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
+ $(ECHO) -e -n "\033[0;1;5mconvert \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
else \
- echo "convert $< -> $@"; \
+ $(ECHO) "convert $< -> $@"; \
fi; \
cat $< | sed -e 's;<_;<;g' -e 's;</_;</;g' > $@; \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mconvert : \033[34m$< -> $@\033[0m"; \
+ $(ECHO) -e "\r\033[0mconvert : \033[34m$< -> $@\033[0m"; \
fi; \
fi
@@ -154,24 +159,24 @@ $(BUILDDIR)/%.xml: %.xml.in
$(BUILDDIR)/%_options.h: $(BUILDDIR)/%.xml
@if [ '$(color)' != 'no' ]; then \
- echo -e -n "\033[0;1;5mbcop'ing \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
+ $(ECHO) -e -n "\033[0;1;5mbcop'ing \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
else \
- echo "bcop'ing $< -> $@"; \
+ $(ECHO) "bcop'ing $< -> $@"; \
fi
@$(BCOP) --header=$@ $<
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mbcop'ing : \033[34m$< -> $@\033[0m"; \
+ $(ECHO) -e "\r\033[0mbcop'ing : \033[34m$< -> $@\033[0m"; \
fi
$(BUILDDIR)/%_options.c: $(BUILDDIR)/%.xml
@if [ '$(color)' != 'no' ]; then \
- echo -e -n "\033[0;1;5mbcop'ing \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
+ $(ECHO) -e -n "\033[0;1;5mbcop'ing \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
else \
- echo "bcop'ing $< -> $@"; \
+ $(ECHO) "bcop'ing $< -> $@"; \
fi
@$(BCOP) --source=$@ $<
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mbcop'ing : \033[34m$< -> $@\033[0m"; \
+ $(ECHO) -e "\r\033[0mbcop'ing : \033[34m$< -> $@\033[0m"; \
fi
#
@@ -179,13 +184,13 @@ $(BUILDDIR)/%_options.c: $(BUILDDIR)/%.xml
$(BUILDDIR)/compiz-%.schema: $(BUILDDIR)/%.xml
@if [ '$(color)' != 'no' ]; then \
- echo -e -n "\033[0;1;5mschema'ing\033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
+ $(ECHO) -e -n "\033[0;1;5mschema'ing\033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
else \
- echo "schema'ing $< -> $@"; \
+ $(ECHO) "schema'ing $< -> $@"; \
fi
@xsltproc `pkg-config --variable=xsltdir compiz-gconf`/schemas.xslt $< > $@
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mschema : \033[34m$< -> $@\033[0m"; \
+ $(ECHO) -e "\r\033[0mschema : \033[34m$< -> $@\033[0m"; \
fi
#
@@ -193,9 +198,9 @@ $(BUILDDIR)/compiz-%.schema: $(BUILDDIR)/%.xml
$(BUILDDIR)/compiz-%.pc: compiz-%.pc.in
@if [ '$(color)' != 'no' ]; then \
- echo -e -n "\033[0;1;5mpkgconfig \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
+ $(ECHO) -e -n "\033[0;1;5mpkgconfig \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
else \
- echo "pkgconfig $< -> $@"; \
+ $(ECHO) "pkgconfig $< -> $@"; \
fi
@COMPIZREQUIRES=`cat $(PKGDIR)/compiz.pc | grep Requires | sed -e 's;Requires: ;;g'`; \
COMPIZCFLAGS=`cat $(PKGDIR)/compiz.pc | grep Cflags | sed -e 's;Cflags: ;;g'`; \
@@ -204,33 +209,33 @@ $(BUILDDIR)/compiz-%.pc: compiz-%.pc.in
-e "s;@COMPIZ_REQUIRES@;$$COMPIZREQUIRES;g" \
-e "s;@COMPIZ_CFLAGS@;$$COMPIZCFLAGS;g" $< > $@;
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mpkgconfig : \033[34m$< -> $@\033[0m"; \
+ $(ECHO) -e "\r\033[0mpkgconfig : \033[34m$< -> $@\033[0m"; \
fi
#
# Compiling
#
-$(BUILDDIR)/%.lo: %.c
+$(BUILDDIR)/%.lo: %.c $(h-files)
@if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
else \
- echo "compiling $< -> $@"; \
+ $(ECHO) "compiling $< -> $@"; \
fi
@$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -I$(BUILDDIR) -c -o $@ $<
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
+ $(ECHO) -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
fi
-$(BUILDDIR)/%.lo: $(BUILDDIR)/%.c
+$(BUILDDIR)/%.lo: $(BUILDDIR)/%.c $(h-files)
@if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
else \
- echo "compiling $< -> $@"; \
+ $(ECHO) "compiling $< -> $@"; \
fi
@$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -I$(BUILDDIR) -c -o $@ $<
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
+ $(ECHO) -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
fi
@@ -240,129 +245,129 @@ $(BUILDDIR)/%.lo: $(BUILDDIR)/%.c
cxx-rpath-prefix := -Wl,-rpath,
-$(BUILDDIR)/lib$(PLUGIN).la: $(addprefix $(BUILDDIR)/,$(c-objs))
+$(BUILDDIR)/lib$(PLUGIN).la: $(all-c-objs)
@if [ '$(color)' != 'no' ]; then \
- echo -e -n "\033[0;1;5mlinking \033[0m: \033[0;31m$@\033[0m"; \
+ $(ECHO) -e -n "\033[0;1;5mlinking \033[0m: \033[0;31m$@\033[0m"; \
else \
- echo "linking : $@"; \
+ $(ECHO) "linking : $@"; \
fi
@$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $(all-c-objs)
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$@\033[0m"; \
+ $(ECHO) -e "\r\033[0mlinking : \033[34m$@\033[0m"; \
fi
clean:
@if [ '$(color)' != 'no' ]; then \
- echo -e -n "\033[0;1;5mremoving \033[0m: \033[0;31m./$(BUILDDIR)\033[0m"; \
+ $(ECHO) -e -n "\033[0;1;5mremoving \033[0m: \033[0;31m./$(BUILDDIR)\033[0m"; \
else \
- echo "removing : ./$(BUILDDIR)"; \
+ $(ECHO) "removing : ./$(BUILDDIR)"; \
fi
@rm -rf $(BUILDDIR)
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mremoving : \033[34m./$(BUILDDIR)\033[0m"; \
+ $(ECHO) -e "\r\033[0mremoving : \033[34m./$(BUILDDIR)\033[0m"; \
fi
install: $(DESTDIR) all
@if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
else \
- echo "install : $(DESTDIR)/lib$(PLUGIN).so"; \
+ $(ECHO) "install : $(DESTDIR)/lib$(PLUGIN).so"; \
fi
@mkdir -p $(DESTDIR)
@$(INSTALL) $(BUILDDIR)/.libs/lib$(PLUGIN).so $(DESTDIR)/lib$(PLUGIN).so
@if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0minstall : \033[34m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
+ $(ECHO) -e "\r\033[0minstall : \033[34m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
fi
@if [ -e $(BUILDDIR)/$(PLUGIN).xml ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
else \
- echo "install : $(XMLDIR)/$(PLUGIN).xml"; \
+ $(ECHO) "install : $(XMLDIR)/$(PLUGIN).xml"; \
fi; \
mkdir -p $(XMLDIR); \
cp $(BUILDDIR)/$(PLUGIN).xml $(XMLDIR)/$(PLUGIN).xml; \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0minstall : \033[34m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
+ $(ECHO) -e "\r\033[0minstall : \033[34m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
fi; \
fi
@if [ -n "$(hdr-install-target)" ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
else \
- echo "install : $(CINCDIR)/compiz/$(hdr-install-target)"; \
+ $(ECHO) "install : $(CINCDIR)/compiz/$(hdr-install-target)"; \
fi; \
cp $(hdr-install-target) $(CINCDIR)/compiz/$(hdr-install-target); \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0minstall : \033[34m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
+ $(ECHO) -e "\r\033[0minstall : \033[34m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
fi; \
fi
@if [ -n "$(pkg-target)" ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
else \
- echo "install : $(PKGDIR)/compiz-$(PLUGIN).pc"; \
+ $(ECHO) "install : $(PKGDIR)/compiz-$(PLUGIN).pc"; \
fi; \
cp $(pkg-target) $(PKGDIR)/compiz-$(PLUGIN).pc; \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0minstall : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
+ $(ECHO) -e "\r\033[0minstall : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
fi; \
fi
@if [ -n "$(schema-output)" -a -e "$(schema-output)" ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(schema-output)\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5minstall \033[0m: \033[0;31m$(schema-output)\033[0m"; \
else \
- echo "install : $(schema-output)"; \
+ $(ECHO) "install : $(schema-output)"; \
fi; \
gconftool-2 --install-schema-file=$(schema-output) > /dev/null; \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0minstall : \033[34m$(schema-output)\033[0m"; \
+ $(ECHO) -e "\r\033[0minstall : \033[34m$(schema-output)\033[0m"; \
fi; \
fi
uninstall:
@if [ -e $(DESTDIR)/lib$(PLUGIN).so ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
else \
- echo "uninstall : $(DESTDIR)/lib$(PLUGIN).so"; \
+ $(ECHO) "uninstall : $(DESTDIR)/lib$(PLUGIN).so"; \
fi; \
rm -f $(DESTDIR)/lib$(PLUGIN).so; \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0muninstall : \033[34m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
+ $(ECHO) -e "\r\033[0muninstall : \033[34m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
fi; \
fi
@if [ -e $(XMLDIR)/$(PLUGIN).xml ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
else \
- echo "uninstall : $(XMLDIR)/$(PLUGIN).xml"; \
+ $(ECHO) "uninstall : $(XMLDIR)/$(PLUGIN).xml"; \
fi; \
rm -f $(XMLDIR)/$(PLUGIN).xml; \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0muninstall : \033[34m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
+ $(ECHO) -e "\r\033[0muninstall : \033[34m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
fi; \
fi
@if [ -n "$(hdr-install-target)" -a -e $(CINCDIR)/compiz/$(hdr-install-target) ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
else \
- echo "uninstall : $(CINCDIR)/compiz/$(hdr-install-target)"; \
+ $(ECHO) "uninstall : $(CINCDIR)/compiz/$(hdr-install-target)"; \
fi; \
rm -f $(CINCDIR)/compiz/$(hdr-install-target); \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0muninstall : \033[34m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
+ $(ECHO) -e "\r\033[0muninstall : \033[34m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
fi; \
fi
@if [ -n "$(pkg-target)" -a -e $(PKGDIR)/compiz-$(PLUGIN).pc ]; then \
if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
+ $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
else \
- echo "uninstall : $(PKGDIR)/compiz-$(PLUGIN).pc"; \
+ $(ECHO) "uninstall : $(PKGDIR)/compiz-$(PLUGIN).pc"; \
fi; \
rm -f $(PKGDIR)/compiz-$(PLUGIN).pc; \
if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0muninstall : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
+ $(ECHO) -e "\r\033[0muninstall : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
fi; \
- fi
\ No newline at end of file
+ fi
More information about the commits
mailing list