summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcls%seawood.org <devnull@localhost>1999-09-21 19:55:01 +0000
committercls%seawood.org <devnull@localhost>1999-09-21 19:55:01 +0000
commita62b6b6cf2b458bca84d073f5416a07e93bacd3e (patch)
tree5a38435c713db166e8fc15023c940a96d83a67fd
parent0ade3e3d37b482c7d4e6b0dd4ef9809811948ed9 (diff)
downloadnspr-hg-unlabeled-1.3.2.1.4.tar.gz
Patch provided by Lee Iverson <leei@ai.sri.com>unlabeled-1.3.2.1.4
Ensure that unmodified include files & symlinks are not modified. Added --disable-shared option. Resurrect use of OS_LIBS & EXTRA_LIBS. Add check for -ldl. Added nsprincl.sh & nsprincl.mk to build.
-rw-r--r--pr/tests/Makefile.in16
1 files changed, 16 insertions, 0 deletions
diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in
index 04b79dcf..08b0d277 100644
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -181,6 +181,8 @@ LDOPTS = -L$(DIST)/lib
LIBPR = -lnspr$(MOD_VERSION)
LIBPLC = -lplc$(MOD_VERSION)
+ifndef USE_AUTOCONF
+
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
@@ -410,6 +412,8 @@ else
endif
endif
+endif # !USE_AUTOCONF
+
#####################################################
#
# The rules
@@ -418,6 +422,16 @@ endif
include $(topsrcdir)/config/rules.mk
+ifdef USE_AUTOCONF
+
+# Cancel this rule (force implicit)
+%: %.c
+
+%: %.$(OBJ_SUFFIX)
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
+
+else # !USE_AUTOCONF
+
AIX_PRE_4_2 = 0
ifeq ($(OS_ARCH),AIX)
ifeq ($(OS_RELEASE),4.1)
@@ -479,6 +493,8 @@ endif
endif
+endif # !USE_AUTOCONF
+
export:: $(TARGETS)
install:: export
clean::