diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index 599f7f3b..408d4c27 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -7,8 +7,11 @@ VERSION     = $(shell cat $(TOPDIR)/VERSION)
 PROJECT     = mod
 MOD         = mod
 LIBNAME     = $(MOD)
-OBJ         = $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(wildcard *.c *.cc)))
-SHOBJS      = $(patsubst %.cc,lib%.so$(patsubst %.c,lib%.so,$(wildcard *.c *.cc)))
+CFILES      = $(wildcard *.c)
+CPPFILES    = $(wildcard *.cc *.cpp)
+CALLSRC     = $(CFILES) $(CPPFILES)
+OBJ         = $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC))))
+SHOBJS      = $(patsubst %.cpp,%.o,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC)))
 SHSCRIPTS   = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
 SCRIPTS     = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
 INST_HDRS   = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h))
@@ -27,7 +30,7 @@ CFLAGS    = -Wall -D_DEBUG_ $(MEMWATCH) -g $(INCLUDE) $(LOCAL_CFLAGS)
 CPPFLAGS  = -Wall -D_DEBUG_ $(MEMWATCH) -g $(INCLUDE) $(LOCAL_CPPFLAGS)
 LDFFTW    = -lrfftw -lfftw -lm
 #LDAUDIO   = -laudiofile
-LDFLAGS   = -L$(LIBDIR) -l$(LIBNAME)  -lg++
+LDFLAGS   = -L$(LIBDIR) -l$(LIBNAME) -lg++
 LDREST    = -ldl $(LDAUDIO) $(LDFFTW) $(LOCAL_LDFLAGS)
 CC        = $(YAMD)gcc
 CPP       = c++
diff --git a/make/tex.mk b/make/tex.mk
index 655e61e8..e78fc1e9 100644
--- a/make/tex.mk
+++ b/make/tex.mk
@@ -15,8 +15,6 @@ ALL = $(FMT_OUT) html_install
 PRE_HTML = $(patsubst %.tmpl,%,$(wildcard *.html.tmpl))
 PRE_TEX  = $(patsubst %.tmpl,%,$(wildcard *.tex.tmpl) $(LOCAL_IMPORTED_TEMPLATES))
 TEXSRC = $(wildcard *.tex $(IMAGES) $(LOCAL_SRC)) $(PRE_TEX)
-test:
-	echo $(LOCAL_IMPORTED_TEMPLATES) + $(IMPORTED_TEMPLATES) + $(TEX_TMPL_DIR)
 DATE := $(shell date +'%b, %d, %Y')
 
 WD = `pwd`