***************
*** 28,34 ****
  
  # Extra xdvi-specific compiler options.
  ps_def = @PS_DEF@
- prog_cflags = $(LIBWWWCPPFLAGS) $(ps_def) $(x_cppflags)
  
  # We don't use alloca ourselves, but the X library might, and this way
  # we avoid buggy versions in -lPW or -lucb.
--- 52,61 ----
  
  # Extra xdvi-specific compiler options.
  ps_def = @PS_DEF@
+ dvi_filter = @DVIFILTERCMD@
+ vflib_def = @VFLIB_DEF@
+ xdviprint_def = @XDVIPRINT_DEF@
+ prog_cflags = $(LIBWWWCPPFLAGS) $(ps_def) $(x_cppflags) $(dvi_filter) $(vflib_def) $(xdviprint_def)
  
  # We don't use alloca ourselves, but the X library might, and this way
  # we avoid buggy versions in -lPW or -lucb.
***************
*** 37,51 ****
  objects = xdvi.o dvi-draw.o dvi-init.o events.o font-open.o \
    gf.o pk.o psdps.o psgs.o psheader.o psnews.o special.o util.o vf.o sfDir.o \
    sfDraw.o sfPath.o sfSelFile.o hypertex.o mime.o wwwfetch.o \
    $(ALLOCA)
  
  program = xdvi.bin
  programs = $(program)
  
- default all: $(programs) xdvi.1 
  
  $(program): $(kpathsea) $(objects) $(LIBWWWDEP)
- 	$(kpathsea_link) $(objects) $(x_link) $(LOADLIBES)
  
  squeeze: squeeze.o
  	$(link_command) squeeze.o $(LIBS) $(XLOADLIBES)
--- 64,80 ----
  objects = xdvi.o dvi-draw.o dvi-init.o events.o font-open.o \
    gf.o pk.o psdps.o psgs.o psheader.o psnews.o special.o util.o vf.o sfDir.o \
    sfDraw.o sfPath.o sfSelFile.o hypertex.o mime.o wwwfetch.o \
+   zeit.o dnpzeit.o toc.o markpage.o markring.o print.o \
+   paper.o tategaki.o vfontmap.o \
    $(ALLOCA)
  
  program = xdvi.bin
  programs = $(program)
  
+ default all: $(programs) xdvi.1 xdviprint
  
  $(program): $(kpathsea) $(objects) $(LIBWWWDEP)
+ 	$(kpathsea_link) $(objects) $(x_link) $(VFLIB) $(LOADLIBES)
  
  squeeze: squeeze.o
  	$(link_command) squeeze.o $(LIBS) $(XLOADLIBES)