← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nspr/quantal-security

« back to all changes in this revision

Viewing changes to mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-08-10 11:34:26 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090810113426-3uv4diflrkcbdimm
Tags: 4.8-0ubuntu1
https://launchpad.net/bugs/387812
* New upstream release: 4.8 (LP: #387812)
* adjust patches to changed upstreanm codebase
  - update debian/patches/99_configure.patch
* update shlibs symbols to include new API elements
  - update debian/libnspr4-0d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
46
46
 
47
47
include $(topsrcdir)/config/config.mk
48
48
 
49
 
ifeq ($(OS_TARGET), WIN16)
50
 
OS_CFLAGS = $(OS_EXE_CFLAGS)
51
 
endif
52
 
 
53
49
CXXSRCS =           \
54
50
        testprstrm.cpp    \
55
51
        $(NULL)
75
71
LIBPRSTRMS = -lprstrms$(MOD_MAJOR_VERSION)
76
72
 
77
73
ifeq ($(OS_ARCH), WINNT)
78
 
ifeq ($(OS_TARGET), WIN16)
79
 
  LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
80
 
  LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).lib
81
 
else
82
74
  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
83
75
  ifeq ($(OS_TARGET), WIN95)
84
76
    LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
88
80
    LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
89
81
  endif
90
82
endif
91
 
endif
92
83
 
93
84
ifeq ($(OS_ARCH),OS2)
94
85
LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
211
202
$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
212
203
        @$(MAKE_OBJDIR)
213
204
ifeq ($(OS_ARCH), WINNT)
214
 
ifeq ($(OS_TARGET),WIN16)
215
 
        echo system windows >w16link
216
 
        echo option map >>w16link
217
 
        echo option stack=10K >>w16link
218
 
        echo option heapsize=32K >>w16link
219
 
        echo debug $(DEBUGTYPE) all >>w16link
220
 
        echo name $@  >>w16link
221
 
        echo file >>w16link
222
 
        echo $<  >>w16link
223
 
        echo library  >>w16link
224
 
        echo $(LIBPR),       >>w16link
225
 
        echo $(LIBPRSTRMS),              >>w16link
226
 
        echo winsock.lib     >>w16link
227
 
        wlink @w16link.
228
 
else
229
205
        link $(LDOPTS) $< $(LIBPR) $(LIBPRSTRMS) wsock32.lib -out:$@
230
 
endif
231
206
else
232
207
ifeq ($(OS_ARCH),OS2)
233
208
        $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPR) $(LIBPRSTRMS) $(OS_LIBS) $(EXTRA_LIBS)