aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2011-10-15 16:43:14 +0200
committerJoakim Plate <elupus@ecce.se>2011-10-15 18:23:04 +0200
commit500f762bdc4d120f7e096787b2f39877aadc1994 (patch)
tree89af9a3bcde92ec1783500e7ca366fec6635d561
parent67421b6184fc8c1fd86d263d95def4d8e3b596e3 (diff)
changed: silence linking step of xbmc.bin
-rwxr-xr-xMakefile.in6
-rw-r--r--Makefile.include.in1
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 53d8579012..9829eac4d6 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -404,9 +404,9 @@ LIBS += @PYTHON_LDFLAGS@
xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
ifeq ($(findstring osx,@ARCH@), osx)
- $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
+ $(SILENT_LD) $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
else
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--no-whole-archive $(LIBS) -rdynamic
+ $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--no-whole-archive $(LIBS) -rdynamic
endif
xbmc-xrandr: xbmc-xrandr.c
@@ -414,7 +414,7 @@ ifneq (1,@USE_XRANDR@)
# xbmc-xrandr.c gets picked up by the default make rules
@echo "excluding xbmc-xrandr"
else
- $(CC) $(CFLAGS) $(LDFLAGS) -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lX11
+ $(SILENT_LD) $(CC) $(CFLAGS) $(LDFLAGS) -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lX11
endif
tools/XBMCTex/XBMCTex:
diff --git a/Makefile.include.in b/Makefile.include.in
index 787c8fa28a..8d41cf980c 100644
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -64,6 +64,7 @@ ifneq ($(V), 1)
SILENT_GCH=@echo "GCH $@";
SILENT_MM =@echo "MM $@";
SILENT_AR =@echo "AR $@";
+ SILENT_LD =@echo "LD $@";
endif
OBJS+=$(filter %.o,$(SRCS:.cpp=.o))