diff --git a/Makefile b/Makefile index 8a24033..faf10aa 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = Panel VERSION = 0.2.17 SUBDIRS = data doc include po src tools -RM ?= rm -f -LN ?= ln -f -TAR ?= tar -czvf +RM = rm -f +LN = ln -f +TAR = tar -czvf all: subdirs diff --git a/data/16x16/Makefile b/data/16x16/Makefile index 08b80a2..7eac0bb 100644 --- a/data/16x16/Makefile +++ b/data/16x16/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local DESTDIR = -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f all: diff --git a/data/22x22/Makefile b/data/22x22/Makefile index dea9149..19a27ae 100644 --- a/data/22x22/Makefile +++ b/data/22x22/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local DESTDIR = -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f all: diff --git a/data/24x24/Makefile b/data/24x24/Makefile index 3daa2e6..b110de0 100644 --- a/data/24x24/Makefile +++ b/data/24x24/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local DESTDIR = -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f all: diff --git a/data/32x32/Makefile b/data/32x32/Makefile index b3e21c2..8f8d112 100644 --- a/data/32x32/Makefile +++ b/data/32x32/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local DESTDIR = -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f all: diff --git a/data/48x48/Makefile b/data/48x48/Makefile index 23d350d..da1ce14 100644 --- a/data/48x48/Makefile +++ b/data/48x48/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local DESTDIR = -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f all: diff --git a/data/Makefile b/data/Makefile index 77d6da0..90634d3 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,14 +1,14 @@ SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f TARGETS = Panel.pc PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: subdirs $(TARGETS) diff --git a/data/scalable/Makefile b/data/scalable/Makefile index 02ad09f..7601508 100644 --- a/data/scalable/Makefile +++ b/data/scalable/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local DESTDIR = -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f all: diff --git a/doc/Makefile b/doc/Makefile index 9d66534..7c14b5a 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,10 +1,10 @@ TARGETS = panel.1 panel.html panelctl.1 panelctl.html panel-embed.1 panel-embed.html panel-message.1 panel-message.html panel-notify.1 panel-notify.html PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/include/Makefile b/include/Makefile index ae91673..9d42322 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,9 +1,9 @@ PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install INCLUDEDIR= $(PREFIX)/include diff --git a/po/Makefile b/po/Makefile index fc8f57b..17522a8 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,10 +1,10 @@ TARGETS = Panel.pot fr.mo PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/src/Makefile b/src/Makefile index 4f12aa1..2d98425 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,15 +4,15 @@ PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W CFLAGS = -Wall -g -O2 -pedantic -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: subdirs $(TARGETS) diff --git a/src/applets/Makefile b/src/applets/Makefile index 2a29344..9685b64 100644 --- a/src/applets/Makefile +++ b/src/applets/Makefile @@ -2,19 +2,19 @@ TARGETS = battery.so bluetooth.so clock.so close.so cpu.so cpufreq.so desktop.so PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib -CC ?= cc +CC = cc CPPFLAGSF= -I ../../include -CPPFLAGS?= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0` -fPIC CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0` -AR ?= ar -RANLIB ?= ranlib -CCSHARED?= $(CC) -shared -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +AR = ar +RANLIB = ranlib +CCSHARED= $(CC) -shared +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/tools/Makefile b/tools/Makefile index 966d912..3c096ad 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,16 +3,16 @@ PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libSystem libDesktop` CFLAGS = -Wall -g -O2 LDFLAGSF= `pkg-config --libs libSystem libDesktop` -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS)