diff --git a/make/defs.mk b/make/defs.mk
index f95795fd..cb617148 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -52,7 +52,7 @@ RCCFILES     = $(wildcard *.qrc)
 CALLSRC      = $(CFILES) $(CPPFILES)
 OBJ          = $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC))))
 OBJ         += $(patsubst %.S,%.o,$(SFILES))
-SHOBJS       = $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC))))
+SHOBJS      += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC))))
 SHSCRIPTS    = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
 SCRIPTS      = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
 LOCAL_HDR    = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h))
diff --git a/make/rules.mk b/make/rules.mk
index f5d38fb7..4bc7e09d 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -266,3 +266,6 @@ cvsupdate:
 
 prepend_header:
 	for f in $(SRC_UNHEADERED); do sh $(TOPDIR)/hdr/prepend_header.sh $$f; done
+
+remake:
+	make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS))