diff options
Diffstat (limited to 'lib/msgc/src/Makefile.in')
| -rw-r--r-- | lib/msgc/src/Makefile.in | 74 |
1 files changed, 16 insertions, 58 deletions
diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in index d486acc9..685d028d 100644 --- a/lib/msgc/src/Makefile.in +++ b/lib/msgc/src/Makefile.in @@ -26,96 +26,54 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - -INCLUDES = -I$(DIST)/include -I../include +INCLUDES = -I$(dist_includedir) -I../include CSRCS = prgcapi.c prmsgc.c ifeq ($(OS_ARCH),WINNT) -ifeq ($(OS_TARGET),WIN16) -CSRCS += win16gc.c +CSRCS += win32gc.c else -ifeq ($(OS_TARGET),OS2) +ifeq ($(OS_ARCH),OS2) CSRCS += os2gc.c else -CSRCS += win32gc.c -endif -endif -else CSRCS += unixgc.c endif +endif -NSPR_VERSION = $(MOD_VERSION) +NSPR_VERSION = $(MOD_MAJOR_VERSION) + +EXTRA_LIBS = $(LIBNSPR) + +ifdef RESOLVE_LINK_SYMBOLS +EXTRA_LIBS += $(OS_LIBS) +endif ifeq ($(OS_ARCH), WINNT) -ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET))) -EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).lib -else DLLBASE=/BASE:0x30000000 #RES=$(OBJDIR)/ds.res #RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc #OS_LIBS = user32.lib -EXTRA_LIBS = $(DIST)/lib/libnspr$(NSPR_VERSION).lib - -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$(NSPR_VERSION)_shr -else -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION) -endif -endif - -# 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 # WINNT LIBRARY_NAME = msgc -LIBRARY_VERSION = $(MOD_VERSION) +LIBRARY_VERSION = $(MOD_MAJOR_VERSION) RELEASE_LIBS = $(TARGETS) include $(topsrcdir)/config/rules.mk # -# 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 - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir) endif ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin endif -install:: export |