From a2637545e1419956096899a82a9c79511d83fbc5 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 15 Jan 2010 00:20:57 +0100 Subject: solve some merge problems --- vcl/source/gdi/makefile.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'vcl') diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk index 9e4047d63e82..ed2a9b2ba1e1 100755 --- a/vcl/source/gdi/makefile.mk +++ b/vcl/source/gdi/makefile.mk @@ -58,6 +58,7 @@ EXCEPTIONSFILES= $(SLO)$/salmisc.obj \ $(SLO)$/print.obj \ $(SLO)$/print2.obj \ $(SLO)$/print3.obj \ + $(SLO)$/oldprintadaptor.obj \ $(SLO)$/configsettings.obj \ $(SLO)$/sallayout.obj \ $(SLO)$/image.obj \ @@ -73,7 +74,6 @@ EXCEPTIONSFILES= $(SLO)$/salmisc.obj \ $(SLO)$/pngread.obj \ $(SLO)$/pngwrite.obj \ $(SLO)$/virdev.obj \ - $(SLO)$/impprn.obj \ $(SLO)$/gdimtf.obj \ $(SLO)$/graphictools.obj \ $(SLO)$/textlayout.obj \ @@ -105,7 +105,6 @@ SLOFILES= $(EXCEPTIONSFILES) \ $(SLO)$/mapmod.obj \ $(SLO)$/metaact.obj \ $(SLO)$/octree.obj \ - $(SLO)$/oldprintadaptor.obj \ $(SLO)$/outmap.obj \ $(SLO)$/outdev2.obj \ $(SLO)$/outdev4.obj \ @@ -118,11 +117,7 @@ SLOFILES= $(EXCEPTIONSFILES) \ $(SLO)$/pdfwriter.obj \ $(SLO)$/salgdilayout.obj \ $(SLO)$/extoutdevdata.obj \ - $(SLO)$/salnativewidgets-none.obj \ - $(SLO)$/bmpconv.obj \ - $(SLO)$/pngread.obj \ - $(SLO)$/pngwrite.obj \ - $(SLO)$/graphictools.obj + $(SLO)$/salnativewidgets-none.obj # --- Targets ------------------------------------------------------ -- cgit