diff options
| author | wtc%netscape.com <devnull@localhost> | 1999-11-18 05:26:06 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1999-11-18 05:26:06 +0000 |
| commit | 158ef42442d00aaab71c8022e38b296f79ac44e2 (patch) | |
| tree | c41dd04b3a1883b2e956da25afc1cf296eedceac | |
| parent | 2491a59b40d0eb77a500c75dc45a2a663e10d344 (diff) | |
| download | nspr-hg-158ef42442d00aaab71c8022e38b296f79ac44e2.tar.gz | |
Minor improvements. In objs.mk fixed the problem that pthreads_user.c
is added to CSRCS twice if USE_AUTOCONF is not defined.
Modified files: pr/src/md/unix/Makefile,Makefile.in,objs.mk
| -rw-r--r-- | pr/src/md/unix/Makefile | 10 | ||||
| -rw-r--r-- | pr/src/md/unix/Makefile.in | 14 | ||||
| -rw-r--r-- | pr/src/md/unix/objs.mk | 14 |
3 files changed, 9 insertions, 29 deletions
diff --git a/pr/src/md/unix/Makefile b/pr/src/md/unix/Makefile index 7e9b5185..f6bf7407 100644 --- a/pr/src/md/unix/Makefile +++ b/pr/src/md/unix/Makefile @@ -38,9 +38,9 @@ ifneq ($(USE_PTHREADS),1) CSRCS += uxpoll.c endif -PTH_USER_CSRCS = \ - pthreads_user.c \ - $(NULL) +ifeq ($(PTHREADS_USER),1) +CSRCS += pthreads_user.c +endif IRIX_CSRCS = \ irix.c \ @@ -134,10 +134,6 @@ NTO_CSRCS = \ nto.c \ $(NULL) -ifeq ($(PTHREADS_USER),1) -CSRCS += $(PTH_USER_CSRCS) -endif - ifeq ($(OS_ARCH),IRIX) CSRCS += $(IRIX_CSRCS) endif diff --git a/pr/src/md/unix/Makefile.in b/pr/src/md/unix/Makefile.in index 666ce7ff..93bd0255 100644 --- a/pr/src/md/unix/Makefile.in +++ b/pr/src/md/unix/Makefile.in @@ -47,9 +47,9 @@ ifneq ($(USE_PTHREADS),1) CSRCS += uxpoll.c endif -PTH_USER_CSRCS = \ - pthreads_user.c \ - $(NULL) +ifeq ($(PTHREADS_USER),1) +CSRCS += pthreads_user.c +endif ifndef USE_AUTOCONF @@ -145,14 +145,6 @@ NTO_CSRCS = \ nto.c \ $(NULL) -endif # !USE_AUTOCONF - -ifeq ($(PTHREADS_USER),1) -CSRCS += $(PTH_USER_CSRCS) -endif - -ifndef USE_AUTOCONF - ifeq ($(OS_ARCH),IRIX) CSRCS += $(IRIX_CSRCS) endif diff --git a/pr/src/md/unix/objs.mk b/pr/src/md/unix/objs.mk index ce23756e..37a6c070 100644 --- a/pr/src/md/unix/objs.mk +++ b/pr/src/md/unix/objs.mk @@ -30,9 +30,9 @@ ifneq ($(USE_PTHREADS),1) CSRCS += uxpoll.c endif -PTH_USER_CSRCS = \ - pthreads_user.c \ - $(NULL) +ifeq ($(PTHREADS_USER),1) +CSRCS += pthreads_user.c +endif ifdef USE_AUTOCONF @@ -132,10 +132,6 @@ NTO_CSRCS = \ nto.c \ $(NULL) -ifeq ($(PTHREADS_USER),1) -CSRCS += $(PTH_USER_CSRCS) -endif - ifeq ($(OS_ARCH),IRIX) CSRCS += $(IRIX_CSRCS) endif @@ -251,10 +247,6 @@ endif endif # !USE_AUTOCONF -ifeq ($(PTHREADS_USER),1) -CSRCS += $(PTH_USER_CSRCS) -endif - OBJS += $(addprefix md/unix/$(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \ $(addprefix md/unix/$(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX))) |