summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-09-11 17:39:07 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-09-11 17:39:07 +0000
commite8eefb32053e8e9cc971a29a21aaa0a49253a58b (patch)
tree4fed001c8657fd034c0224783ba75a16980648d5 /include
parent337b63d864ff9cbd74639d0295bfc361a7621d12 (diff)
downloadATCD-e8eefb32053e8e9cc971a29a21aaa0a49253a58b.tar.gz
fixed shared_libs_only; removed unused SHOBJ from shared/static_libs_only
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/wrapper_macros.GNU15
1 files changed, 7 insertions, 8 deletions
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index c0d0189fcc7..0dc72945410 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -153,21 +153,20 @@ ifdef shared_libs_only
ifeq ($(SHLIB),)
#### Makefile only specifies static libs, so only build static libs.
else
- #### don't build static objects:
- BUILD = $(VSHLIB) $(SHLIBA) $(VBIN)
- LIB =
- OBJDIRS = .shobj
- SHOBJ = $(addsuffix .$(SOEXT),$(FILES))
- VDIR =
+ #### Don't build static objects:
+ BUILD = $(VSHLIB) $(SHLIBA) $(VBIN)
+ LIB =
+ ifeq ($(BIN),)
+ OBJDIRS = .shobj
+ endif # BIN
endif # SHLIB
else
ifdef static_libs_only
- #### don't build shared objects:
+ #### Don't build shared objects:
BUILD = $(VLIB) $(VBIN)
OBJDIRS = .obj
PIC =
SHLIB =
- SHOBJ = $(addsuffix .o,$(FILES))
SOEXT = o
VSHDIR = .obj/
VLDLIBS = $(LDLIBS:%.so=%.o)