--- Makefile.am.orig	2008-09-16 12:23:34.000000000 -0700
+++ Makefile.am	2008-09-16 12:24:14.000000000 -0700
@@ -2,12 +2,13 @@
 
 include $(top_srcdir)/Makefile.incl
 
+AM_CPPFLAGS = @PICFLAGS@ @DEFS@
+
 AUTOMAKE_OPTIONS = foreign
 
 BOINC_LIBS = -L$(BOINCDIR)/api -lboinc_api -L$(BOINCDIR)/lib -lboinc
 
-CLIENT_C_FLAGS = $(APP_CFLAGS) $(CFLAGS) \
-                $(DEFS) \
+CLIENT_C_FLAGS =  $(DEFS) \
                 -DTEXT_UI -DNDEBUG -DCLIENT \
                 -I$(top_srcdir)/../server/db  \
 		-I$(SETI_BOINC_DIR) \
@@ -15,9 +16,11 @@
 		-I$(SETI_BOINC_DIR)/client \
                 $(BOINC_CFLAGS)  \
                 $(PTHREAD_CFLAGS)  \
-                $(ASMLIB_CFLAGS)
+                $(ASMLIB_CFLAGS) \
+                $(APP_CFLAGS) \
+                $(OPT_CFLAGS)
 
-CLIENT_LD_FLAGS = $(PTHREAD_CFLAGS) $(LDFLAGS) $(APP_LDFLAGS)
+CLIENT_LD_FLAGS = $(PTHREAD_CFLAGS) $(APP_LDFLAGS) $(OPT_LDFLAGS)
 CLIENT_LD_ADD = $(PTHREAD_LIBS) $(BOINC_LIBS) $(APP_LIBS)
 
 if ENABLE_GUI