diff --git a/Makefile b/Makefile index 9b11d1b..aaa8d4a 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = Mailer VERSION = 0.1.6 SUBDIRS = data doc include po src src/plugins tests -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 f6bf717..2480fb5 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/24x24/Makefile b/data/24x24/Makefile index 2d6bb3c..75c062a 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/48x48/Makefile b/data/48x48/Makefile index 5a311da..475ec44 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 d66de66..92814ad 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,14 +1,14 @@ SUBDIRS = 16x16 24x24 48x48 -MKDIR ?= mkdir -p -INSTALL ?= install -RM ?= rm -f +MKDIR = mkdir -p +INSTALL = install +RM = rm -f TARGETS = Mailer.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/doc/Makefile b/doc/Makefile index ea2814e..d4a2aaa 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -2,10 +2,10 @@ SUBDIRS = gtkdoc TARGETS = compose.1 compose.html gtkdoc/Mailer.types gtkdoc/tmpl.stamp gtkdoc/sgml.stamp gtkdoc/html.stamp mailer.1 mailer.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: subdirs $(TARGETS) diff --git a/include/Mailer/Makefile b/include/Mailer/Makefile index 3bd3503..af4c8b2 100644 --- a/include/Mailer/Makefile +++ b/include/Mailer/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/include/Makefile b/include/Makefile index ef30202..469d748 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,10 +1,10 @@ SUBDIRS = Mailer 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 f8240bb..b26cbe2 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,10 +1,10 @@ TARGETS = Mailer.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 63b14d9..072ac5a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,22 +3,22 @@ TARGETS = libMailer.a libMailer.so.0.0 libMailer.so.0 libMailer.so compose maile PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib -CC ?= cc -CPPFLAGSF?= -CPPFLAGS?= +CC = cc +CPPFLAGSF= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libDesktop` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs libDesktop` LDFLAGS = -AR ?= ar -RANLIB ?= ranlib -CCSHARED?= $(CC) -shared +AR = ar +RANLIB = ranlib +CCSHARED= $(CC) -shared BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin -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/account/Makefile b/src/account/Makefile index 02887d8..ce2fe7a 100644 --- a/src/account/Makefile +++ b/src/account/Makefile @@ -2,19 +2,19 @@ TARGETS = imap4.so mbox.so pop3.so nntp.so rss.so PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib -CC ?= cc +CC = cc CPPFLAGSF= -I ../../include -CPPFLAGS?= +CPPFLAGS= CFLAGSF = -W -fPIC `pkg-config --cflags openssl` `pkg-config --cflags glib-2.0` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs openssl` -lssl `pkg-config --libs glib-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/src/plugins/Makefile b/src/plugins/Makefile index 8e3b9f0..2c90ab5 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -2,19 +2,19 @@ TARGETS = mailing-lists.so search.so template.so PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib -CC ?= cc +CC = cc CPPFLAGSF= -I ../../include -CPPFLAGS?= +CPPFLAGS= CFLAGSF = -W -fPIC `pkg-config --cflags libDesktop` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs openssl` -lssl `pkg-config --libs libDesktop` -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/tests/Makefile b/tests/Makefile index 9fc7830..815c6ac 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -3,16 +3,16 @@ PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin -CC ?= cc +CC = cc CPPFLAGSF= -I ../include -CPPFLAGS?= +CPPFLAGS= CFLAGSF = -W CFLAGS = -Wall -g -O2 -ffreestanding LDFLAGS = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS)