Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 775881 | Differences between
and this patch

Collapse All | Expand All

(-)a/Makefile (-1 / +6 lines)
Lines 168-175 else Link Here
168
    LINK_CMD    = $(LIBTOOL) --mode=link $(CC) \
168
    LINK_CMD    = $(LIBTOOL) --mode=link $(CC) \
169
                  $(subst /,$(COMPILER_SEP),$(LDFLAGS))
169
                  $(subst /,$(COMPILER_SEP),$(LDFLAGS))
170
    LINK_LIBS   = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
170
    LINK_LIBS   = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
171
    INSTALL     = $(LIBTOOL) --mode=install install -D -m 0755
171
  else
172
  else
172
    LINK_CMD = $(CC) $(subst /,$(COMPILER_SEP),$(LDFLAGS))
173
    LINK_CMD = $(CC) $(subst /,$(COMPILER_SEP),$(LDFLAGS))
174
    INSTALL  = install -D -m 0755
173
    ifeq ($(PLATFORM),unixdev)
175
    ifeq ($(PLATFORM),unixdev)
174
      LINK_LIBS := $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) -lm -lrt -lz -lbz2 -lpthread
176
      LINK_LIBS := $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) -lm -lrt -lz -lbz2 -lpthread
175
      LINK_LIBS += $(shell pkg-config --libs libpng)
177
      LINK_LIBS += $(shell pkg-config --libs libpng)
Lines 194-200 else Link Here
194
                $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \
196
                $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \
195
                $(GRAPH_LINK) $(MATH)
197
                $(GRAPH_LINK) $(MATH)
196
198
197
  .PHONY: exes clean distclean
199
  .PHONY: exes clean distclean install
198
200
199
201
200
  ###################################################################
202
  ###################################################################
Lines 567-572 else Link Here
567
                        $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
569
                        $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
568
	  $(LINK_NEW)
570
	  $(LINK_NEW)
569
571
572
install: exes
573
	$(foreach var,$(EXES), $(INSTALL) $(BIN_DIR_2)/$(var) \
574
		$(DESTDIR)$(bindir)/$(var);)
570
endif
575
endif
571
576
572
577

Return to bug 775881