diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index 5bf1a610..940df5b3 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -62,12 +62,12 @@ MEMBERS     = $(LIB)($(OBJ))
 #YAMD        = yamd-
 #EFENCE      = -lefence
 #CFLAGS    = -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production
-CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) 
-CFLAGS    = $(INCLUDE) $(CFLAGS_DEBUG) $(LOCAL_CFLAGS)
-CPPFLAGS  = $(INCLUDE) $(CFLAGS_DEBUG) $(LOCAL_CPPFLAGS)
+#CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) 
+CFLAGS    = $(INCLUDE) $(PROJECT_CFLAGS)   $(LOCAL_CFLAGS)
+CPPFLAGS  = $(INCLUDE) $(PROJECT_CPPFLAGS) $(LOCAL_CPPFLAGS)
 LDFFTW    = -lrfftw -lfftw -lm
 #LDAUDIO   = -laudiofile
-LDFLAGS   = -L$(LIBDIR) $(EFENCE) -l$(LIBNAME) -lg++ $(PROJECT_LDFLAGS) $(LOCAL_LDFLAGS) 
+LDFLAGS   = -L$(LIBDIR) -l$(PROJECT) -lg++ $(PROJECT_LDFLAGS) $(LOCAL_LDFLAGS) 
 LDREST    = -ldl $(LDAUDIO) $(LDFFTW) 
 CC        = $(YAMD)gcc
 CPP       = $(YAMD)g++