Switch to side-by-side view

--- a/src/internfile/Makefile
+++ b/src/internfile/Makefile
@@ -1,25 +1,20 @@
-depth = ..
-include $(depth)/mk/sysconf
-
-# Only test executables get build in here
 PROGS = mh_mbox internfile
 
-all: librecoll $(PROGS) 
+all: $(PROGS) 
 
-INTERNFILE_OBJS= trinternfile.o  $(BIGLIB) 
+INTERNFILE_OBJS= trinternfile.o
 internfile : $(INTERNFILE_OBJS) 
-	$(CXX) $(ALL_CXXFLAGS) -o internfile $(INTERNFILE_OBJS) \
-	       $(LIBRECOLL) $(LIBICONV) $(LIBSYS)
+	$(CXX) $(ALL_CXXFLAGS) -o internfile $(INTERNFILE_OBJS) $(LIBRECOLL)
 trinternfile.o : internfile.cpp 
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_INTERNFILE -c -o trinternfile.o \
 	       internfile.cpp
 
 MH_MBOX_OBJS= trmh_mbox.o  $(BIGLIB) 
 mh_mbox : $(MH_MBOX_OBJS) 
-	$(CXX) $(ALL_CXXFLAGS) -o mh_mbox $(MH_MBOX_OBJS) \
-	       $(LIBRECOLL) $(LIBICONV) $(LIBSYS)
+	$(CXX) $(ALL_CXXFLAGS) -o mh_mbox $(MH_MBOX_OBJS) $(LIBRECOLL)
 trmh_mbox.o : mh_mbox.cpp 
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_MH_MBOX -c -o trmh_mbox.o \
 	       mh_mbox.cpp
 
-include $(depth)/mk/commontargets
+include ../utils/utmkdefs.mk
+