From 84a48b89fb881cabfd37ab7fa5df670abae6f2f5 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Fri, 19 Jan 2007 01:36:16 +0000
Subject: [PATCH] Re-generated Makefiles

---
 Makefile             |  3 +++
 src/Makefile         |  6 ++++--
 src/account/Makefile | 17 +++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 86658f0..b05547f 100644
--- a/Makefile
+++ b/Makefile
@@ -27,13 +27,16 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/compose.c \
 		$(PACKAGE)-$(VERSION)/src/mailer.c \
 		$(PACKAGE)-$(VERSION)/src/main.c \
+		$(PACKAGE)-$(VERSION)/src/Makefile \
 		$(PACKAGE)-$(VERSION)/src/mailer.h \
 		$(PACKAGE)-$(VERSION)/src/project.conf \
 		$(PACKAGE)-$(VERSION)/src/account/mbox.c \
 		$(PACKAGE)-$(VERSION)/src/account/pop3.c \
 		$(PACKAGE)-$(VERSION)/src/account/imap4.c \
 		$(PACKAGE)-$(VERSION)/src/account/rss.c \
+		$(PACKAGE)-$(VERSION)/src/account/Makefile \
 		$(PACKAGE)-$(VERSION)/src/account/project.conf \
+		$(PACKAGE)-$(VERSION)/Makefile \
 		$(PACKAGE)-$(VERSION)/project.conf
 	$(RM) $(PACKAGE)-$(VERSION)
 
diff --git a/src/Makefile b/src/Makefile
index f6a0795..88b5ae4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,6 +5,7 @@ DESTDIR	=
 BINDIR	= $(PREFIX)/bin
 INCLUDEDIR= $(PREFIX)/include
 CC	= cc
+CPPFLAGS=
 CFLAGSF	= -W `pkg-config gtk+-2.0 --cflags`
 CFLAGS	= -Wall -g -O2 -ansi
 LDFLAGSF= `pkg-config gtk+-2.0 --libs`
@@ -19,9 +20,10 @@ subdirs:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
 
 mailer_OBJS = account.o callbacks.o common.o compose.o mailer.o main.o
-mailer_CFLAGS = $(CFLAGSF) $(CFLAGS)
+mailer_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+
 mailer: $(mailer_OBJS)
-	$(CC) $(LDFLAGSF) $(LDFLAGS) -o mailer $(mailer_OBJS)
+	$(CC) -o mailer $(mailer_OBJS) $(LDFLAGSF) $(LDFLAGS)
 
 account.o: account.c account/account.h
 	$(CC) $(mailer_CFLAGS) -c account.c
diff --git a/src/account/Makefile b/src/account/Makefile
index 1424c05..4153fa5 100644
--- a/src/account/Makefile
+++ b/src/account/Makefile
@@ -3,6 +3,7 @@ PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
 CC	= cc
+CPPFLAGS=
 CFLAGSF	= -W -fPIC
 CFLAGS	= -Wall -g -O2
 AR	= ar -rc
@@ -16,34 +17,42 @@ INSTALL	= install
 all: $(TARGETS)
 
 mbox_OBJS = mbox.o
-mbox_CFLAGS = $(CFLAGSF) $(CFLAGS)
+mbox_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+
 mbox.a: $(mbox_OBJS)
 	$(AR) mbox.a $(mbox_OBJS)
 	$(RANLIB) mbox.a
+
 mbox.so: $(mbox_OBJS)
 	$(LD) -o mbox.so $(mbox_OBJS)
 
 pop3_OBJS = pop3.o
-pop3_CFLAGS = $(CFLAGSF) $(CFLAGS)
+pop3_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+
 pop3.a: $(pop3_OBJS)
 	$(AR) pop3.a $(pop3_OBJS)
 	$(RANLIB) pop3.a
+
 pop3.so: $(pop3_OBJS)
 	$(LD) -o pop3.so $(pop3_OBJS)
 
 imap4_OBJS = imap4.o
-imap4_CFLAGS = $(CFLAGSF) $(CFLAGS)
+imap4_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+
 imap4.a: $(imap4_OBJS)
 	$(AR) imap4.a $(imap4_OBJS)
 	$(RANLIB) imap4.a
+
 imap4.so: $(imap4_OBJS)
 	$(LD) -o imap4.so $(imap4_OBJS)
 
 rss_OBJS = rss.o
-rss_CFLAGS = $(CFLAGSF) $(CFLAGS)
+rss_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+
 rss.a: $(rss_OBJS)
 	$(AR) rss.a $(rss_OBJS)
 	$(RANLIB) rss.a
+
 rss.so: $(rss_OBJS)
 	$(LD) -o rss.so $(rss_OBJS)