#238039

r=bsmedberg
Make makefile change not so ugly

gfx/src/os2/Makefile.in

@@ -63,6 +63,9 @@ REQUIRES = xpcom \
 		  imglib2 \
 		  $(NULL)
 
+# code that we share with Win32
+SHARED_LCPPSRCS = nsUnicodeRange.cpp
+
 CPPSRCS		= \
 		nsDeviceContextSpecOS2.cpp \
 		nsDeviceContextOS2.cpp \
@@ -77,7 +80,7 @@ CPPSRCS		= \
 		nsGfxFactoryOS2.cpp \
 		nsPrintOptionsOS2.cpp \
 		nsGfxDefs.cpp \
-		$(topsrcdir)/gfx/src/windows/nsUnicodeRange.cpp \
+		$(SHARED_LCPPSRCS) \
 		$(NULL)
 
 EXPORTS	= \
@@ -94,10 +97,18 @@ EXTRA_DSO_LDOPTS = \
 		-lpmwinx \
 		$(NULL)
 
+GARBAGE += $(SHARED_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
+
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(topsrcdir)/gfx/src \
-    -I$(topsrcdir)/gfx/src/shared \
-    -I$(topsrcdir)/gfx/src/windows
+LOCAL_INCLUDES = \
+		-I$(srcdir)/.. \
+		-I$(srcdir)/../shared \
+		-I$(srcdir)/../windows \
+		$(NULL)
 
 DEFINES += -DUSE_OS2_TOOLKIT_HEADERS
+
+export:: $(addprefix $(srcdir)/../windows/,$(SHARED_LCPPSRCS))
+	$(INSTALL) $^ .
+