smock: use $basearch in smock.mock.extra
[fedora-mingw.git] / nspr / mingw32-nspr-4.7.2-build.patch
1 --- pr/src/Makefile.in.orig     2008-11-10 16:34:55.000000000 +0000
2 +++ pr/src/Makefile.in  2008-11-10 17:12:24.000000000 +0000
3 @@ -193,9 +193,12 @@
4  OS_LIBS                = -lsocket -lnsl -lgen -lresolv
5  endif
6  
7 -ifeq ($(OS_ARCH),WINNT)
8 +ifeq ($(OS_TARGET),WINNT)
9  ifdef NS_USE_GCC
10 +IMPORT_LIBRARY  = libnspr4.dll.a
11 +TARGETS        += libnspr4.dll.a
12  OS_LIBS                = -ladvapi32 -lwsock32 -lwinmm
13 +libnspr4.dll.a: libnspr4.dll
14  else
15  OS_LIBS                = advapi32.lib wsock32.lib winmm.lib
16  endif
17 --- lib/ds/Makefile.in.orig     2008-11-10 16:45:35.000000000 +0000
18 +++ lib/ds/Makefile.in  2008-11-10 17:12:51.000000000 +0000
19 @@ -62,10 +62,10 @@
20  
21  HEADERS := $(addprefix $(srcdir)/, $(HEADERS))
22  
23 -ifeq ($(OS_ARCH), WINNT)
24 -RES=$(OBJDIR)/plds.res
25 -RESNAME=plds.rc
26 -endif # WINNT
27 +#ifeq ($(OS_TARGET), WINNT)
28 +#RES=$(OBJDIR)/plds.res
29 +#RESNAME=plds.rc
30 +#endif # WINNT
31  
32  ifeq ($(OS_ARCH), AIX)
33  ifeq ($(CLASSIC_NSPR),1)
34 @@ -121,7 +121,10 @@
35  endif
36  
37  LIBRARY_NAME   = plds
38 +IMPORT_LIBRARY  = libplds.dll.a
39 +OS_LIBS         = -ladvapi32 -lwsock32 -lwinmm
40  LIBRARY_VERSION        = $(MOD_MAJOR_VERSION)
41 +libplds.dll.a: libplds.dll
42  
43  RELEASE_HEADERS = $(HEADERS)
44  RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
45 --- lib/libc/src/Makefile.in.orig       2008-11-10 16:55:40.000000000 +0000
46 +++ lib/libc/src/Makefile.in    2008-11-10 16:59:59.000000000 +0000
47 @@ -71,10 +71,17 @@
48  
49  RELEASE_LIBS = $(TARGETS)
50  
51 -ifeq ($(OS_ARCH),WINNT)
52 -RES=$(OBJDIR)/plc.res
53 -RESNAME=plc.rc
54 -endif # WINNT
55 +ifeq ($(OS_TARGET),WINNT)
56 +IMPORT_LIBRARY  = libplc4.dll.a
57 +TARGETS        += libplc4.dll.a
58 +OS_LIBS                = -ladvapi32 -lwsock32 -lwinmm
59 +libplc4.dll.a: libplc4.dll
60 +endif
61 +
62 +#ifeq ($(OS_TARGET),WINNT)
63 +#RES=$(OBJDIR)/plc.res
64 +#RESNAME=plc.rc
65 +#endif # WINNT
66  
67  ifeq ($(OS_ARCH), AIX)
68  ifeq ($(CLASSIC_NSPR),1)