diff options
Diffstat (limited to 'lib/libc/src/Makefile.in')
| -rw-r--r-- | lib/libc/src/Makefile.in | 87 |
1 files changed, 15 insertions, 72 deletions
diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in index ffd13253..c7b56c1a 100644 --- a/lib/libc/src/Makefile.in +++ b/lib/libc/src/Makefile.in @@ -26,16 +26,7 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifndef USE_AUTOCONF -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif -endif #!USE_AUTOCONF - -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(dist_includedir) CSRCS =\ plvrsion.c \ @@ -55,64 +46,20 @@ CSRCS =\ $(NULL) LIBRARY_NAME = plc -LIBRARY_VERSION = $(MOD_VERSION) +LIBRARY_VERSION = $(MOD_MAJOR_VERSION) RELEASE_LIBS = $(TARGETS) -ifndef USE_AUTOCONF ifeq ($(OS_ARCH),WINNT) -ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET))) -ifdef XP_OS2_EMX -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) -else -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib -endif -else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/plc.res RESNAME=plc.rc -ifeq ($(OS_TARGET),WIN95) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib -else -EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib -endif - -ifdef MOZ_DEBUG -ifdef GLOWCODE -EXTRA_LIBS += $(GLOWDIR)/glowcode.lib -endif -endif - -endif -else -ifeq ($(OS_ARCH), AIX) -ifeq ($(CLASSIC_NSPR),1) -OS_LIBS += -lc -else -OS_LIBS += -lc_r -endif -endif -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr -else -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) -endif -endif +endif # WINNT -# On NCR and SCOOS, we can't link with extra libraries when -# we build a shared library. If we do so, the linker doesn't -# complain, but we would run into weird problems at run-time. -# Therefore on these platforms, we link just the .o files. -ifeq ($(OS_ARCH),NCR) -EXTRA_LIBS = -endif -ifeq ($(OS_ARCH),SCOOS) -EXTRA_LIBS = -endif -endif #!USE_AUTOCONF +EXTRA_LIBS = $(LIBNSPR) ifdef RESOLVE_LINK_SYMBOLS -EXTRA_LIBS := -L$(DIST)/lib -lnspr$(MOD_VERSION) +EXTRA_LIBS += $(OS_LIBS) endif GARBAGE += $(TINC) @@ -130,11 +77,7 @@ SH_DATE = $(shell date) SH_NOW = $(shell $(NOW)) ifeq ($(OS_ARCH), WINNT) -ifeq ($(OS_TARGET),OS2) - SUF = -else SUF = i64 -endif else SUF = LL endif @@ -152,34 +95,35 @@ $(TINC): $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) ifeq ($(OS_ARCH), WINNT) -ifdef XP_OS2_EMX - $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $< + $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $< else +ifeq ($(MOZ_OS2_TOOLS), VACPP) $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $< -endif else $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $< endif +endif # # Version information generation (end) # # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(dist_bindir), # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir) else - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir) endif ifeq ($(OS_ARCH), OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(dist_libdir) + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(dist_bindir) endif endif ifeq ($(MOZ_BITS),16) @@ -187,4 +131,3 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin endif -install:: export |