Make lib.misc compile as C++.

Author: meisterT

Makefile.global

@@ -62,12 +62,11 @@ endef
 # Library objects required in multiple places:
 LIBSBASE   = $(addprefix $(TOPDIR)/lib/,lib.error lib.misc)
 LIBHEADERS = $(addsuffix .h,$(LIBSBASE))
-LIBSOURCES = $(addsuffix .c,$(LIBSBASE))
 LIBOBJECTS = $(addsuffix $(OBJEXT),$(LIBSBASE))
 CFLAGS   += -I$(TOPDIR)/lib -I$(TOPDIR)/etc
 CXXFLAGS += -I$(TOPDIR)/lib -I$(TOPDIR)/etc
 
-$(LIBOBJECTS): %$(OBJEXT): %.c %.h
+$(LIBOBJECTS):
 	$(MAKE) -C $(TOPDIR)/lib $(notdir $@)
 
 # Default recursive targets; these should always at least call the

judge/Makefile

@@ -13,14 +13,14 @@ judgehost: $(TARGETS) $(SUBST_FILES)
 $(SUBST_FILES): %: %.in $(TOPDIR)/paths.mk
 	$(substconfigvars)
 
-evict: evict.cc $(LIBHEADERS) $(LIBSOURCES)
-	$(CXX) $(CXXFLAGS) -o $@ $< $(LIBSOURCES)
+evict: evict.cc $(LIBOBJECTS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBOBJECTS)
 
-runguard: runguard.cc $(LIBHEADERS) $(LIBSOURCES) $(TOPDIR)/etc/runguard-config.h
-	$(CXX) $(CXXFLAGS) -o $@ $< $(LIBSOURCES) $(LIBCGROUP)
+runguard: runguard.cc $(LIBOBJECTS) $(TOPDIR)/etc/runguard-config.h
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBOBJECTS) $(LIBCGROUP)
 
-runpipe: runpipe.cc $(LIBHEADERS) $(LIBSOURCES)
-	$(CXX) $(CXXFLAGS) -static -o $@ $< $(LIBSOURCES)
+runpipe: runpipe.cc $(LIBOBJECTS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -static -o $@ $< $(LIBOBJECTS)
 
 install-judgehost:
 	$(INSTALL_PROG) -t $(DESTDIR)$(judgehost_libjudgedir) \

lib/Makefile

@@ -4,11 +4,12 @@ endif
 
 include $(TOPDIR)/Makefile.global
 
-OBJECTS = $(addsuffix $(OBJEXT),lib.error lib.misc)
+OBJECTS = lib.error$(OBJEXT) lib.misc$(OBJEXT)
 
 build: $(OBJECTS)
 
-$(OBJECTS): %$(OBJEXT): %.c %.h
+lib.error$(OBJEXT): lib.error.c lib.error.h
+lib.misc$(OBJEXT): lib.misc.cc lib.misc.h
 
 clean-l:
 	rm -f $(OBJECTS)