diff options
| author | cls%seawood.org <devnull@localhost> | 1999-10-19 05:30:36 +0000 |
|---|---|---|
| committer | cls%seawood.org <devnull@localhost> | 1999-10-19 05:30:36 +0000 |
| commit | 15fe0deb41a456f636f3df2c26d0ce2680fdcb79 (patch) | |
| tree | 5e0969e78dd5e9f246e536169a3565c8cadb4276 | |
| parent | cd71910c0a780ea8430fc416c4d6649f6d8674c4 (diff) | |
| download | nspr-hg-15fe0deb41a456f636f3df2c26d0ce2680fdcb79.tar.gz | |
Syncing Makefile.ins with srinivas' previous checkin.
r=shaver
| -rw-r--r-- | config/Makefile.in | 6 | ||||
| -rw-r--r-- | pr/src/md/unix/Makefile.in | 10 | ||||
| -rw-r--r-- | pr/tests/Makefile.in | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index 57ff9c0b..a0004143 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -39,7 +39,6 @@ else PROG_SUFFIX = endif -ifdef notdef # Temporary workaround to disable the generation of # library build time because now.c uses the 'long long' # data type that's not available on some platforms. @@ -66,7 +65,7 @@ endif ifeq ($(OS_ARCH), HP-UX) ifeq ($(USE_64),1) - XLDOPTS += +DD64 + XLDOPTS += +DA2.0W endif endif @@ -79,7 +78,6 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP) OS_CFLAGS = $(OS_EXE_CFLAGS) endif -endif # notdef include $(topsrcdir)/config/rules.mk PROGS = $(OBJDIR)/now$(PROG_SUFFIX) @@ -109,4 +107,4 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP) $(LINK) $(EXEFLAGS) $< else $(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@ -endif
\ No newline at end of file +endif diff --git a/pr/src/md/unix/Makefile.in b/pr/src/md/unix/Makefile.in index de8cac05..1b75bfbd 100644 --- a/pr/src/md/unix/Makefile.in +++ b/pr/src/md/unix/Makefile.in @@ -39,11 +39,14 @@ CSRCS = \ unix.c \ unix_errors.c \ uxproces.c \ - uxwrap.c \ - uxpoll.c \ uxshm.c \ + uxwrap.c \ $(NULL) +ifneq ($(USE_PTHREADS),1) +CSRCS += uxpoll.c +endif + PTH_USER_CSRCS = \ pthreads_user.c \ $(NULL) @@ -322,6 +325,9 @@ ifeq ($(USE_64),1) else /usr/ccs/bin/as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v8plus $< endif + +clean:: + rm -rf $(ULTRASPARC_ASOBJS) endif endif endif diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index 8779108b..ae6b60ba 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -62,6 +62,7 @@ CSRCS = \ dtoa.c \ errcodes.c \ exit.c \ + fdcach.c \ fileio.c \ foreign.c \ forktest.c \ @@ -90,7 +91,7 @@ CSRCS = \ multiacc.c \ multiwait.c \ many_cv.c \ - nameshm1.c \ + nameshm1.c \ nbconn.c \ nblayer.c \ nonblock.c \ @@ -274,7 +275,8 @@ endif ifeq ($(OS_ARCH), HP-UX) LDOPTS += -z -Wl,+s,+b,$(ABSOLUTE_LIB_DIR) ifeq ($(USE_64),1) - LDOPTS += -L/usr/lib/pa20_64 -lpthread +DD64 + LDOPTS += +DA2.0W + EXTRA_LIBS = -lpthread endif endif |