Adding support for linking binaries

This commit is contained in:
mcafee%netscape.com 1999-01-22 04:00:13 +00:00
parent fb94168157
commit 8cf7e6c736
2 changed files with 7 additions and 2 deletions

View File

@ -430,6 +430,11 @@ XPDIST = $(DEPTH)/dist
DIST = $(DEPTH)/dist/$(OBJDIR_NAME)
endif
# We need to know where to find the libraries we
# put on the link line for binaries, and should
# we link statically or dynamic? Assuming dynamic for now.
LIBS_DIR = -L$(DIST)/bin
# all public include files go in subdirectories of PUBLIC:
PUBLIC = $(XPDIST)/public

View File

@ -358,9 +358,9 @@ ifeq ($(OS_ARCH),WINNT)
$(CC) $(PROGOBJS) -Fe$@ -link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
else
ifdef CPP_PROG_LINK
$(CCC) $(CFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS)
$(CCC) $(CFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS)
else
$(CCF) -o $@ $(PROGOBJS) $(LDFLAGS)
$(CCF) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS)
endif
endif
endif