From: Chris R. <cv...@cv...> - 2007-01-15 02:47:28
|
Modified file emc2/src/hal/utils/Submakefile Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/Submakefile?rev=1.21> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/Submakefile.diff?r1=1.20;r2=1.21> Branch: HEAD Log: revision 1.21 date: 2007/01/15 02:47:23; author: cradek; state: Exp; lines: +2 -2 don't cause make to blindly expand -lreadline according to VPATH, which breaks linking according to LDFLAGS's library search path --- Submakefile 2006/10/16 12:28:55 1.20 +++ Submakefile 2007/01/15 02:47:23 1.21 @@ -1,9 +1,9 @@ HALCMDSRCS := hal/utils/halcmd.c USERSRCS += $(HALCMDSRCS) -../bin/halcmd: $(call TOOBJS, $(HALCMDSRCS)) ../lib/libemc.a ../lib/libnml.so ../lib/libemchal.so $(READLINE_LIBS) +../bin/halcmd: $(call TOOBJS, $(HALCMDSRCS)) ../lib/libemc.a ../lib/libnml.so ../lib/libemchal.so $(ECHO) Linking $(notdir $@) - @$(CXX) $(LDFLAGS) -o $@ $^ + $(CXX) $(LDFLAGS) -o $@ $^ $(READLINE_LIBS) TARGETS += ../bin/halcmd ifneq ($(GTK_VERSION),) |