--- frontend/Makefile.am.orig	Thu Jul 25 23:22:25 2002
+++ frontend/Makefile.am	Sun Jul  6 07:49:21 2003
@@ -2,8 +2,9 @@
 
 faad_SOURCES = main.c audio.c
 
-CXXFLAGS = -O2
-CFLAGS = -O2 -D_FILE_OFFSET_BITS=64
+CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64
+CCLD = $(CXX)
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
 LDFLAGS =
 LDADD = $(top_builddir)/libfaad/libfaad.la $(top_builddir)/common/mp4v2/libmp4v2.la  -lm -lsndfile