# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300730303 0
# Node ID c3309b5e6f545e5c1a6df4c820b7910f9ec29187
# Parent 0d58dd9e3ca8f998505eb9ba10ff60ae0ce27d37
tools: remove unnecessary uses of -L.
It's not needed unless you are linking against a library in the
current directory.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
diff -r 0d58dd9e3ca8 -r c3309b5e6f54 tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile Mon Mar 21 17:46:28 2011 +0000
+++ b/tools/flask/libflask/Makefile Mon Mar 21 17:58:23 2011 +0000
@@ -15,7 +15,6 @@
# Get gcc to generate the dependencies for us.
CFLAGS += -Wp,-MD,.$(@F).d
-LDFLAGS += -L.
LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
diff -r 0d58dd9e3ca8 -r c3309b5e6f54 tools/flask/utils/Makefile
--- a/tools/flask/utils/Makefile Mon Mar 21 17:46:28 2011 +0000
+++ b/tools/flask/utils/Makefile Mon Mar 21 17:58:23 2011 +0000
@@ -27,7 +27,7 @@
all: $(CLIENTS)
$(CLIENTS): flask-%: %.o
- $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lflask
$(LDLIBS_libxenctrl) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -lflask
$(LDLIBS_libxenctrl) -o $@
.PHONY: clean
clean:
diff -r 0d58dd9e3ca8 -r c3309b5e6f54 tools/libxc/Makefile
--- a/tools/libxc/Makefile Mon Mar 21 17:46:28 2011 +0000
+++ b/tools/libxc/Makefile Mon Mar 21 17:58:23 2011 +0000
@@ -77,8 +77,6 @@
# libraries.
#CFLAGS += -DVALGRIND -O0 -ggdb3
-LDFLAGS += -L.
-
CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y))
CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y))
@@ -195,10 +193,10 @@
libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG)
-Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS)
$(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG)
-Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS)
$(COMPRESSION_LIBS) -lz -L. -lxenctrl $(PTHREAD_LIBS)
xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
- $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS)
-lxenctrl
+ $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS)
-L. -lxenctrl
-include $(DEPS)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home