diff options
Diffstat (limited to 'lib/msgc/tests/Makefile.in')
| -rw-r--r-- | lib/msgc/tests/Makefile.in | 84 |
1 files changed, 43 insertions, 41 deletions
diff --git a/lib/msgc/tests/Makefile.in b/lib/msgc/tests/Makefile.in index 6d1e8b42..bd437a79 100644 --- a/lib/msgc/tests/Makefile.in +++ b/lib/msgc/tests/Makefile.in @@ -37,7 +37,7 @@ endif CSRCS = gc1.c thrashgc.c -ifeq ($(OS_ARCH), WINNT) +ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) PROG_SUFFIX = .exe else PROG_SUFFIX = @@ -47,34 +47,38 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(dist_includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib -NSPR_VERSION = $(MOD_VERSION) -GC_VERSION = $(MOD_VERSION) +LDOPTS = -L$(dist_libdir) +NSPR_VERSION = $(MOD_MAJOR_VERSION) +GC_VERSION = $(MOD_MAJOR_VERSION) LIBPR = -lnspr$(NSPR_VERSION) LIBPLC = -lplc$(NSPR_VERSION) LIBGC = -lmsgc$(GC_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib - LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib -else -ifeq ($(OS_TARGET),OS2) - LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib - LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib + LIBPR = $(dist_libdir)/nspr$(NSPR_VERSION).lib + LIBPLC = $(dist_libdir)/plc$(NSPR_VERSION).lib + LIBGC= $(dist_libdir)/msgc$(GC_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) - LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX) - LIBGC= $(DIST)/lib/libmsgc$(GC_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) + LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX) + LIBGC= $(dist_libdir)/libmsgc$(GC_VERSION).$(LIB_SUFFIX) +endif endif + +ifeq ($(OS_ARCH),OS2) +ifeq ($(MOZ_OS2_TOOLS),VACPP) + LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO + LIBPR = $(dist_libdir)/nspr$(NSPR_VERSION).lib + LIBPLC = $(dist_libdir)/plc$(NSPR_VERSION).lib + LIBGC= $(dist_libdir)/msgc$(GC_VERSION).lib +else + LDOPTS += -Zomf -Zlinker /PM:VIO endif endif @@ -83,7 +87,7 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared +LDOPTS += -rpath $(PWD)/$(dist_libdir) -rdata_shared # For 6.x machines, include this flag ifeq ($(basename $(OS_RELEASE)),6) @@ -100,22 +104,22 @@ ifeq ($(OS_ARCH), OSF1) # I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so # we do static linking. ifeq ($(OS_RELEASE), V3.2) - LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a - LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a - LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a + LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).a + LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).a + LIBGC = $(dist_libdir)/libmsgc$(GC_VERSION).a EXTRA_LIBS = -lc_r else - LDOPTS += -rpath $(PWD)/$(DIST)/lib + LDOPTS += -rpath $(PWD)/$(dist_libdir) endif endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -z -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -z -Wl,+s,+b,$(PWD)/$(dist_libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) LIBPR = -lnspr$(NSPR_VERSION)_shr LIBPLC = -lplc$(NSPR_VERSION)_shr @@ -130,9 +134,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(dist_libdir) endif endif @@ -159,16 +163,16 @@ EXTRA_LIBS = $(OS_LIBS) # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a -LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a -LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a +LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).a +LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).a +LIBGC = $(dist_libdir)/libmsgc$(GC_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -178,7 +182,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH), Linux) @@ -194,7 +198,7 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH),SINIX) @@ -202,11 +206,11 @@ EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH), UNIXWARE) -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH),BSD_OS) @@ -247,7 +251,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(NSPR_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(NSPR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) @@ -275,16 +279,14 @@ ifeq ($(OS_TARGET),WIN16) echo winsock.lib >>w16link wlink @w16link. else -ifeq ($(OS_TARGET),OS2) - $(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) so32dll.lib tcp32dll.lib -MAP:$(@:.exe=.map) -out:$@ -else link $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) wsock32.lib -out:$@ -endif -endif +else +ifeq ($(OS_ARCH),OS2) + $(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@ else $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBGC) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@ endif - +endif endif export:: $(TARGETS) |