1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-14 23:32:27 +00:00

Store lib.o name in a variable named LIB_O_NAME.

This commit is contained in:
Laurent MONIN 2006-01-12 19:06:50 +01:00 committed by Laurent MONIN
parent 7cc17f7dce
commit bdc59d5ac4
4 changed files with 6 additions and 5 deletions

View File

@ -179,6 +179,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
MAKE_COLOR = @MAKE_COLOR@
LIB_O_NAME = lib.o
### This is here because Makefile.config is usually the first thing
### we get and sometimes the all rule can be implicit, yet we want

View File

@ -40,7 +40,7 @@ quiet_cmd_compile = ' [$(CC_COLOR)CC$(END_COLOR)] $(RELPATH)$@'
quiet_cmd_ld_objs = " [$(LD_COLOR)LD$(END_COLOR)] $(RELPATH)$@"
cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \
$(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
`test -e $(subdir)/lib.o && echo $(subdir)/lib.o`)
`test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
quiet_cmd_link = ' [$(LINK_COLOR)LINK$(END_COLOR)] $(RELPATH)$@'
cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(2) $(LIBS)
@ -114,10 +114,10 @@ endif
ifdef OBJS
lib.o: $(sort $(OBJS)) $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), $(wildcard $(subdir)/lib.o))
$(LIB_O_NAME): $(sort $(OBJS)) $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), $(wildcard $(subdir)/$(LIB_O_NAME)))
$(call cmd,ld_objs)
LIB_O = lib.o
LIB_O = $(LIB_O_NAME)
CLEAN += $(OBJS) $(LIB_O)
endif

View File

@ -37,7 +37,7 @@ OBJS = vernum.o
vernum.o: FORCE
FORCE:
elinks: lib.o
elinks: $(LIB_O_NAME)
$(call cmd,link)
PROGS = elinks

View File

@ -7,7 +7,7 @@ TEST_PROGS = \
sgml-parser
TESTDEPS = \
$(top_builddir)/src/dom/lib.o \
$(top_builddir)/src/dom/$(LIB_O_NAME) \
$(top_builddir)/src/util/error.o \
$(top_builddir)/src/osdep/stub.o \
$(top_builddir)/src/util/hash.o \