← Back to branch summary

~ubuntu-branches/ubuntu/precise/nspr/precise-proposed

« back to all changes in this revision

Viewing changes to mozilla/nsprpub/config/rules.mk

  • 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/config/rules.mk
106
106
#
107
107
 
108
108
ifdef LIBRARY_NAME
109
 
ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 
109
ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
110
110
 
111
111
#
112
 
# Win95, Win16, and OS/2 require library names conforming to the 8.3 rule.
 
112
# Win95 and OS/2 require library names conforming to the 8.3 rule.
113
113
# other platforms do not.
114
114
#
115
 
ifeq (,$(filter-out WIN95 OS2,$(OS_TARGET)))
 
115
ifeq (,$(filter-out WIN95 WINCE OS2,$(OS_TARGET)))
116
116
LIBRARY         = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
117
117
SHARED_LIBRARY  = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
118
118
IMPORT_LIBRARY  = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
139
139
endif
140
140
 
141
141
ifndef TARGETS
142
 
ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 
142
ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
143
143
TARGETS         = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
144
144
ifndef BUILD_OPT
145
145
ifdef MSC_VER
168
168
                          $(NOSUCHFILE) \
169
169
                          so_locations
170
170
 
171
 
ifeq ($(OS_ARCH),OpenVMS)
172
 
ALL_TRASH               += $(wildcard *.c*_defines)
173
 
ifdef SHARED_LIBRARY
174
 
VMS_SYMVEC_FILE         = $(SHARED_LIBRARY:.$(DLL_SUFFIX)=_symvec.opt)
175
 
VMS_SYMVEC_FILE_MODULE  = $(srcdir)/$(LIBRARY_NAME)_symvec.opt
176
 
ALL_TRASH               += $(VMS_SYMVEC_FILE)
177
 
endif
178
 
endif
179
 
 
180
171
ifndef RELEASE_LIBS_DEST
181
172
RELEASE_LIBS_DEST       = $(RELEASE_LIB_DIR)
182
173
endif
318
309
$(IMPORT_LIBRARY): $(MAPFILE)
319
310
        rm -f $@
320
311
        $(IMPLIB) $@ $(MAPFILE)
 
312
else
 
313
ifeq (,$(filter-out WIN95 WINCE,$(OS_TARGET)))
 
314
$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
 
315
endif
321
316
endif
322
317
 
323
318
$(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE)
341
336
        fi
342
337
endif   # MSVC with manifest tool
343
338
else    # WINNT && !GCC
344
 
ifeq ($(OS_TARGET), OpenVMS)
345
 
        @if test ! -f $(VMS_SYMVEC_FILE); then \
346
 
          if test -f $(VMS_SYMVEC_FILE_MODULE); then \
347
 
            echo Creating component options file $(VMS_SYMVEC_FILE); \
348
 
            cp $(VMS_SYMVEC_FILE_MODULE) $(VMS_SYMVEC_FILE); \
349
 
          fi; \
350
 
        fi
351
 
endif   # OpenVMS
352
 
        $(MKSHLIB) $(OBJS) $(RES) $(EXTRA_LIBS)
 
339
        $(MKSHLIB) $(OBJS) $(RES) $(LDFLAGS) $(EXTRA_LIBS)
353
340
endif   # WINNT && !GCC
354
341
endif   # AIX 4.1
355
342
ifdef ENABLE_STRIP
410
397
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
411
398
        $(CCC) -Fo$@ -c $(CCCFLAGS) $(call pr_abspath,$<)
412
399
else
 
400
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINCE)
 
401
        $(CCC) -Fo$@ -c $(CCCFLAGS) $<
 
402
else
413
403
ifdef NEED_ABSOLUTE_PATH
414
404
        $(CCC) -o $@ -c $(CCCFLAGS) $(call pr_abspath,$<)
415
405
else
416
406
        $(CCC) -o $@ -c $(CCCFLAGS) $<
417
407
endif
418
408
endif
 
409
endif
419
410
 
420
411
WCCFLAGS1 = $(subst /,\\,$(CFLAGS))
421
412
WCCFLAGS2 = $(subst -I,-i=,$(WCCFLAGS1))
425
416
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
426
417
        $(CC) -Fo$@ -c $(CFLAGS) $(call pr_abspath,$<)
427
418
else
 
419
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINCE)
 
420
        $(CC) -Fo$@ -c $(CFLAGS) $<
 
421
else
428
422
ifdef NEED_ABSOLUTE_PATH
429
423
        $(CC) -o $@ -c $(CFLAGS) $(call pr_abspath,$<)
430
424
else
431
425
        $(CC) -o $@ -c $(CFLAGS) $<
432
426
endif
433
427
endif
 
428
endif
434
429
 
435
430
 
436
431
$(OBJDIR)/%.$(OBJ_SUFFIX): %.s