--- xmhtml-1.1.7.orig/lib/common/Makefile.org
+++ xmhtml-1.1.7/lib/common/Makefile.org
@@ -33,16 +33,12 @@
 	images.c readFLG.c readJPEG.c parse.c map.c layout.c LZWStream.c \
 	psoutput.c
 
-COMMONOBJS= events.o hash.o stack.o format.o fonts.o paint.o readXPM.o \
-	readJPEGplc.o quantize.o colors.o private.o readBitmap.o public.o \
-	readPNG.o readGIFplc.o readGIF.o error.o callbacks.o StringUtil.o \
-	images.o readFLG.o readJPEG.o parse.o map.o layout.o LZWStream.o \
-	psoutput.o
+COMMONOBJS= $(COMMONSRCS:%.c=%.$(OBJENDING))
 
 # Comment these out if you don't want to include the debug routines.
 # or define NDEBUG in the toplevel Makefile.
 DEBSRCS= debug.c
-DEBOBJS= debug.o
+DEBOBJS= debug.$(OBJENDING)
 
 SRCS = $(COMMONSRCS) $(DEBSRCS)
 OBJS = $(COMMONOBJS) $(DEBOBJS)
@@ -53,10 +49,12 @@
 # Subdirectories to visit
 SUBDIRS=
 
+.SUFFIXES: .pic_o
+
 # rule to create .o files from .c files 
-.c.o:
+.c.$(OBJENDING):
 	$(RM) $@
-	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
+	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< -o $@
 
 # targets to build
 all: $(TARGET)