diff --git a/make/defs.mk b/make/defs.mk
index d2a75eb4..59a52ec2 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -237,4 +237,12 @@ export LD_LIBRARY_PATH
 UPLOAD_URL_RPM_BIN=rsync_ssh://ftp.jannet.de:/home/ftp/dat/pub/packages/rpm/bin/
 UPLOAD_URL_RPM_SRC=rsync_ssh://ftp.jannet.de:/home/ftp/dat/pub/packages/rpm/src/
 
-
+ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
+	PROJECT_CFLAGS      += -Wall -g3 -D_DO_TRACE_
+	PROJECT_CPPFLAGS    += -Wall -g3 -D_DO_TRACE_
+	PROJECT_LDFLAGS     += -Wall -g3
+else
+	ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
+		PROJECT_CFLAGS   += -funroll-loops -O2 -NDEBUG
+	endif
+endif
diff --git a/make/ytools.mk.in b/make/ytools.mk.in
index 8b6418b4..76c81cbf 100644
--- a/make/ytools.mk.in
+++ b/make/ytools.mk.in
@@ -48,14 +48,4 @@ else
 	include $(TOPDIR)/make/cfg_dist.mk
 endif
 
-ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
-	PROJECT_CFLAGS      += -Wall -g3 -D_DO_TRACE_
-	PROJECT_CPPFLAGS    += -Wall -g3 -D_DO_TRACE_
-	PROJECT_LDFLAGS     += -Wall -g3
-else
-	ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
-		PROJECT_CFLAGS   += -funroll-loops -O2 -NDEBUG
-	endif
-endif
-
 LDFLAGS += -lytools -ldl -pthread