#42637

r=mkaply, a=brendan
OS/2 bringup - Makefiles to build RC files for objdir and non objdir builds

gfx/src/os2/Makefile.in

@@ -75,10 +75,14 @@ OS_LIBS		+= $(NSPR_LIBS)
 # I guess eventually we ought to use an xml dialog...
 # XXX Have to copy files because rc is too stupid for an objdir build
 
-MOZ_POST_DSO_LIB_COMMAND = rc $(RES_FILE)
+MOZ_POST_DSO_LIB_COMMAND = rc -n -x2 $(RES_FILE)
 
 $(SHARED_LIBRARY): $(OBJS) $(RES_FILE)
 
 $(RES_FILE): $(srcdir)/libprint.rc
-	rc -r -I $(srcdir) $(srcdir)/libprint.rc
+ifneq ($(DEPTH),$(topsrcdir))
+	cp $(srcdir)/libprint.ico ./libprint.ico
+	cp $(srcdir)/libprres.h ./libprres.h
+endif
+	rc -n -x2 -r $(srcdir)/libprint.rc
 

widget/src/os2/res/Makefile.in

@@ -26,7 +26,7 @@ include $(DEPTH)/config/autoconf.mk
 OS2_LIBRARYNAME	= wdgtres
 DLL		= wdgtres.dll
 
-RCOPTS		= -n -x2 -i .
+RCOPTS		= -n -x2 -I .
 
 ifneq ($(MOZ_OS2_TOOLS),VACPP)
 OMF_FLAG	= -Zomf
@@ -49,11 +49,22 @@ endif
 	rc $(RCOPTS) wdgtres.res $@
 
 wdgtres.res: wdgtres.rc
-	rc $(RCOPTS) -r -I $(srcdir) -I $(topsrcdir)/widget/src/os2 $(srcdir)/wdgtres.rc $@
+	cp $(topsrcdir)/widget/src/os2/resID.h ./resID.h
+ifneq ($(DEPTH),$(topsrcdir))
+	cp $(srcdir)/frame.ico ./frame.ico
+	cp $(srcdir)/folder.ico ./folder.ico
+	cp $(srcdir)/dragitem.ico ./dragitem.ico
+	cp $(srcdir)/*.ptr .
+	cp $(srcdir)/wdgtres.def ./wdgtres.def
+endif
+	rc $(RCOPTS) -r $(srcdir)/wdgtres.rc $@
 
 wdgtres.obj: wdgtres.C
 	$(CC) -o $@ -s -c $(CFLAGS) $(OMF_FLAG) $<
 
 realclean clean::
 	rm -rf $(DLL) *.res *.obj
+ifneq ($(DEPTH),$(topsrcdir))
+	rm -rf *.ico *.h *.def
+endif