diff -r -C4 ffgtk-0.7.8.org/ffgtk/Makefile.am ffgtk-0.7.8/ffgtk/Makefile.am
*** ffgtk-0.7.8.org/ffgtk/Makefile.am	2011-02-10 22:35:59.495488476 +0100
--- ffgtk-0.7.8/ffgtk/Makefile.am	2011-02-10 23:09:58.558613361 +0100
***************
*** 2,10 ****
  
  ffgtkdir = $(datadir)/pixmaps/
  ffgtk_DATA	= ../images/ffgtk.png
  
! ffgtk_CFLAGS = $(EXTRA_CFLAGS) -DSHAREDIR=\"$(pkgdatadir)/\" -DLIBDIR=\"$(libdir)/ffgtk/\" -DHTMLDIR=\"$(htmldir)/\" -DLIBEXECDIR=\"$(libexecdir)/\" -rdynamic -Wall -Werror -D_GNU_SOURCE -DLOCALE_DIR=\"$(datadir)/locale/\" -g -DUSE_OLD_SPOOLER
  ffgtk_LDFLAGS = $(EXTRA_LIBS) -export-dynamic
  
  ffgtk_SOURCES =\
  	about.c\
--- 2,10 ----
  
  ffgtkdir = $(datadir)/pixmaps/
  ffgtk_DATA	= ../images/ffgtk.png
  
! ffgtk_CFLAGS = $(EXTRA_CFLAGS) -DSHAREDIR=\"$(pkgdatadir)/\" -DLIBDIR=\"$(libdir)/ffgtk/\" -DHTMLDIR=\"$(htmldir)/\" -DLIBEXECDIR=\"$(libexecdir)/\" -rdynamic -Wall -D_GNU_SOURCE -DLOCALE_DIR=\"$(datadir)/locale/\" -g -DUSE_OLD_SPOOLER
  ffgtk_LDFLAGS = $(EXTRA_LIBS) -export-dynamic
  
  ffgtk_SOURCES =\
  	about.c\
diff -r -C4 ffgtk-0.7.8.org/plugins/Makefile.am ffgtk-0.7.8/plugins/Makefile.am
*** ffgtk-0.7.8.org/plugins/Makefile.am	2011-02-10 22:35:59.479488472 +0100
--- ffgtk-0.7.8/plugins/Makefile.am	2011-02-10 23:09:20.624556576 +0100
***************
*** 3,58 ****
  
  if WITH_GNOME_KEYRING
  plugin_LTLIBRARIES += lib_pwd_gnome.la
  lib_pwd_gnome_la_SOURCES = pwd_gnome.c
! lib_pwd_gnome_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk $(GNOME_KEYRING_CFLAGS)
  lib_pwd_gnome_la_LDFLAGS=-shared $(GNOME_KEYRING_LIBS)
  endif
  
  if WITH_KWALLET4
  plugin_LTLIBRARIES += lib_pwd_kde4.la
  lib_pwd_kde4_la_SOURCES = pwd_kde4.cpp pwd_kdemain.cpp
! lib_pwd_kde4_la_CXXFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk  $(KWALLET4_CFLAGS)
  lib_pwd_kde4_la_LDFLAGS=-shared $(KWALLET4_LIBS)
  endif
  
  if WITH_GSTREAMER
  plugin_LTLIBRARIES += lib_audio_gstreamer.la
  lib_audio_gstreamer_la_SOURCES = audio_gstreamer.c
! lib_audio_gstreamer_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk  $(GSTREAMER_CFLAGS)
  lib_audio_gstreamer_la_LDFLAGS=-shared $(GSTREAMER_LIBS)
  endif
  
  plugin_LTLIBRARIES += lib_audio_ao.la
  lib_audio_ao_la_SOURCES = audio_ao.c
! lib_audio_ao_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk  $(GSTREAMER_CFLAGS)
  lib_audio_ao_la_LDFLAGS=-shared $(GSTREAMER_LIBS)
  
  lib_ab_local_la_SOURCES = ab_local.c
! lib_ab_local_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk
  lib_ab_local_la_LDFLAGS=-shared
  
  lib_ab_fritzfon_la_SOURCES = ab_fritzfon.c
! lib_ab_fritzfon_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk
  lib_ab_fritzfon_la_LDFLAGS=-shared
  
  lib_ab_thunderbird_la_SOURCES = ab_thunderbird.c
! lib_ab_thunderbird_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk
  lib_ab_thunderbird_la_LDFLAGS=-shared
  
  lib_ab_vcard_la_SOURCES = ab_vcard.c
! lib_ab_vcard_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk -D_GNU_SOURCE
  lib_ab_vcard_la_LDFLAGS=-shared
  
  if WITH_EBOOK
  plugin_LTLIBRARIES += lib_ab_ebook.la
  lib_ab_ebook_la_SOURCES = ab_ebook.c
! lib_ab_ebook_la_CFLAGS=$(EXTRA_CFLAGS) $(EBOOK_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk
  lib_ab_ebook_la_LDFLAGS=-shared $(EBOOK_LIBS)
  endif
  
  if WITH_CAPIFAX
  plugin_LTLIBRARIES += lib_fax_capifax.la
  lib_fax_capifax_la_SOURCES = fax_capifax.c
! lib_fax_capifax_la_CFLAGS=$(EXTRA_CFLAGS) $(CAPIFAX_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -Werror -O2  -I../ffgtk
  lib_fax_capifax_la_LDFLAGS=-shared $(CAPIFAX_LIBS)
  endif
--- 3,58 ----
  
  if WITH_GNOME_KEYRING
  plugin_LTLIBRARIES += lib_pwd_gnome.la
  lib_pwd_gnome_la_SOURCES = pwd_gnome.c
! lib_pwd_gnome_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk $(GNOME_KEYRING_CFLAGS)
  lib_pwd_gnome_la_LDFLAGS=-shared $(GNOME_KEYRING_LIBS)
  endif
  
  if WITH_KWALLET4
  plugin_LTLIBRARIES += lib_pwd_kde4.la
  lib_pwd_kde4_la_SOURCES = pwd_kde4.cpp pwd_kdemain.cpp
! lib_pwd_kde4_la_CXXFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk  $(KWALLET4_CFLAGS)
  lib_pwd_kde4_la_LDFLAGS=-shared $(KWALLET4_LIBS)
  endif
  
  if WITH_GSTREAMER
  plugin_LTLIBRARIES += lib_audio_gstreamer.la
  lib_audio_gstreamer_la_SOURCES = audio_gstreamer.c
! lib_audio_gstreamer_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk  $(GSTREAMER_CFLAGS)
  lib_audio_gstreamer_la_LDFLAGS=-shared $(GSTREAMER_LIBS)
  endif
  
  plugin_LTLIBRARIES += lib_audio_ao.la
  lib_audio_ao_la_SOURCES = audio_ao.c
! lib_audio_ao_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk  $(GSTREAMER_CFLAGS)
  lib_audio_ao_la_LDFLAGS=-shared $(GSTREAMER_LIBS)
  
  lib_ab_local_la_SOURCES = ab_local.c
! lib_ab_local_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk
  lib_ab_local_la_LDFLAGS=-shared
  
  lib_ab_fritzfon_la_SOURCES = ab_fritzfon.c
! lib_ab_fritzfon_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk
  lib_ab_fritzfon_la_LDFLAGS=-shared
  
  lib_ab_thunderbird_la_SOURCES = ab_thunderbird.c
! lib_ab_thunderbird_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk
  lib_ab_thunderbird_la_LDFLAGS=-shared
  
  lib_ab_vcard_la_SOURCES = ab_vcard.c
! lib_ab_vcard_la_CFLAGS=$(EXTRA_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk -D_GNU_SOURCE
  lib_ab_vcard_la_LDFLAGS=-shared
  
  if WITH_EBOOK
  plugin_LTLIBRARIES += lib_ab_ebook.la
  lib_ab_ebook_la_SOURCES = ab_ebook.c
! lib_ab_ebook_la_CFLAGS=$(EXTRA_CFLAGS) $(EBOOK_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk
  lib_ab_ebook_la_LDFLAGS=-shared $(EBOOK_LIBS)
  endif
  
  if WITH_CAPIFAX
  plugin_LTLIBRARIES += lib_fax_capifax.la
  lib_fax_capifax_la_SOURCES = fax_capifax.c
! lib_fax_capifax_la_CFLAGS=$(EXTRA_CFLAGS) $(CAPIFAX_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall  -O2  -I../ffgtk
  lib_fax_capifax_la_LDFLAGS=-shared $(CAPIFAX_LIBS)
  endif
diff -r -C4 ffgtk-0.7.8.org/voxplay/Makefile.am ffgtk-0.7.8/voxplay/Makefile.am
*** ffgtk-0.7.8.org/voxplay/Makefile.am	2011-02-10 22:35:59.469488470 +0100
--- ffgtk-0.7.8/voxplay/Makefile.am	2011-02-10 23:08:52.912516176 +0100
***************
*** 1,7 ****
  libexec_PROGRAMS = ffgtkvoxplay
  
! ffgtkvoxplay_CFLAGS = $(EXTRA_CFLAGS) -Wall -Werror
  ffgtkvoxplay_LDFLAGS = $(EXTRA_LIBS)
  
  ffgtkvoxplay_SOURCES =\
  	voxplay.c
--- 1,7 ----
  libexec_PROGRAMS = ffgtkvoxplay
  
! ffgtkvoxplay_CFLAGS = $(EXTRA_CFLAGS) -Wall 
  ffgtkvoxplay_LDFLAGS = $(EXTRA_LIBS)
  
  ffgtkvoxplay_SOURCES =\
  	voxplay.c