# 42637

r = mkaply, a = brendan
OS/2 bring-up  - makefile changes to build resource files

gfx/src/os2/Makefile.in

@@ -80,7 +80,5 @@ MOZ_POST_DSO_LIB_COMMAND = rc $(RES_FILE)
 $(SHARED_LIBRARY): $(OBJS) $(RES_FILE)
 
 $(RES_FILE): $(srcdir)/libprint.rc
-	cp $(srcdir)/libprint.ico ./libprint.ico
-	cp $(srcdir)/libprres.h ./libprres.h
-	rc -r $(srcdir)/libprint.rc
+	rc -r -I $(srcdir) $(srcdir)/libprint.rc
 

widget/src/os2/res/Makefile.in

@@ -32,9 +32,11 @@ ifneq ($(MOZ_OS2_TOOLS),VACPP)
 OMF_FLAG	= -Zomf
 endif
 
-export:
+include $(topsrcdir)/config/rules.mk
 
-install: $(DLL)
+export::
+
+install:: $(DLL)
 	$(INSTALL) -m 444 $(DLL) $(DIST)/bin
 
 # XXX Have to copy files because rc and link386 are too stupid for a mirror tree build
@@ -47,17 +49,11 @@ endif
 	rc $(RCOPTS) wdgtres.res $@
 
 wdgtres.res: wdgtres.rc
-	cp $(topsrcdir)/widget/src/os2/resID.h ./resID.h
-	cp $(srcdir)/frame.ico ./frame.ico
-	cp $(srcdir)/folder.ico ./folder.ico
-	cp $(srcdir)/dragitem.ico ./dragitem.ico
-	cp $(srcdir)/select.ptr ./select.ptr
-	cp $(srcdir)/wdgtres.def ./wdgtres.def
-	rc $(RCOPTS) -r $(srcdir)/wdgtres.rc $@
+	rc $(RCOPTS) -r -I $(srcdir) -I $(topsrcdir)/widget/src/os2 $(srcdir)/wdgtres.rc $@
 
 wdgtres.obj: wdgtres.C
 	$(CC) -o $@ -s -c $(CFLAGS) $(OMF_FLAG) $<
 
-realclean clean:
-	rm -rf $(DLL) *.res *.obj *.ico *.h *.def
+realclean clean::
+	rm -rf $(DLL) *.res *.obj