Remove unused error code MOOD_SYNTAX.

[paraslash.git] / Makefile.real

diff --git a/Makefile.real b/Makefile.real
index e5ecfe4290118d83aa23b6bca4f69647f0f1f283..92ef995249680fabdbcdaa1b257b92fabdfd5d2a 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -10,6 +10,7 @@ endif
 .SHELLFLAGS := -ec
 
 LOGLEVELS := LL_DEBUG,LL_INFO,LL_NOTICE,LL_WARNING,LL_ERROR,LL_CRIT,LL_EMERG
+SEVERITIES := \"debug\",\"info\",\"notice\",\"warning\",\"error\",\"crit\",\"emerg\"
 vardir := /var/paraslash
 mandir := $(datarootdir)/man/man1
 MKDIR_P := mkdir -p
@@ -112,6 +113,7 @@ CPPFLAGS += -DBINDIR='"$(bindir)"'
 CPPFLAGS += -DCOPYRIGHT_YEAR='"$(COPYRIGHT_YEAR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DLOGLEVELS='$(LOGLEVELS)'
+CPPFLAGS += -DSEVERITIES=$(SEVERITIES)
 CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -I$(lls_suite_dir)
@@ -255,19 +257,10 @@ $(object_dir)/mm.o \
 
 $(object_dir)/compress_filter.o: CFLAGS += -O3
 
-define CC_CMD
+$(object_dir)/%.o: %.c | $(object_dir) $(dep_dir) $(lsg_h) $(yy_h)
        $(call SAY, CC $<)
-       $(CC) -c -o $(object_dir)/$(*F).o -MMD -MF \
-               $(dep_dir)/$(*F).d -MT $(object_dir)/$(*F).o \
-               $(CPPFLAGS) $(STRICT_CFLAGS) $(CFLAGS) $<
-endef
-CC_PREREQUISITES := %.c | $(object_dir) $(dep_dir) $(lsg_h) $(yy_h)
-# These two have the same prerequisites and the same recipe. There should be a
-# better way to write this.
-$(object_dir)/%.o: $(CC_PREREQUISITES)
-       $(CC_CMD)
-$(dep_dir)/%.d: $(CC_PREREQUISITES)
-       $(CC_CMD)
+       $(CC) -c -o $@ -MMD -MF $(dep_dir)/$(*F).d -MT $@ $(CPPFLAGS) \
+               $(STRICT_CFLAGS) $(CFLAGS) $<
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod \