From 1eabbd742da6d0ce442865b35c364e554d946022 Mon Sep 17 00:00:00 2001 From: andreas 'randy' weinberger Date: Wed, 26 Jan 2011 11:37:15 +0100 Subject: removed unneeded LDFLAGS see http://projects.vdr-developer.org/issues/530 --- tools/convpic/Makefile | 2 +- tools/crtfont/Makefile | 2 +- tools/genfont/Makefile | 2 +- tools/lcdtestpattern/Makefile | 2 +- tools/showpic/Makefile | 2 +- tools/showtext/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/convpic/Makefile b/tools/convpic/Makefile index f666b4e..3932e5f 100644 --- a/tools/convpic/Makefile +++ b/tools/convpic/Makefile @@ -18,7 +18,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/crtfont/Makefile b/tools/crtfont/Makefile index 29f0b5e..bcd100f 100644 --- a/tools/crtfont/Makefile +++ b/tools/crtfont/Makefile @@ -17,7 +17,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/genfont/Makefile b/tools/genfont/Makefile index bed4d9c..14837b0 100644 --- a/tools/genfont/Makefile +++ b/tools/genfont/Makefile @@ -20,7 +20,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/lcdtestpattern/Makefile b/tools/lcdtestpattern/Makefile index da165e2..504e27c 100644 --- a/tools/lcdtestpattern/Makefile +++ b/tools/lcdtestpattern/Makefile @@ -18,7 +18,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/showpic/Makefile b/tools/showpic/Makefile index 17e88d3..5d15d61 100644 --- a/tools/showpic/Makefile +++ b/tools/showpic/Makefile @@ -18,7 +18,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/showtext/Makefile b/tools/showtext/Makefile index 1da8fb5..d0d963a 100644 --- a/tools/showtext/Makefile +++ b/tools/showtext/Makefile @@ -18,7 +18,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: -- cgit v1.2.3 From c29885101605c3711d65b6f7e20e6be3dd7f9837 Mon Sep 17 00:00:00 2001 From: andreas 'randy' weinberger Date: Sun, 6 Mar 2011 10:08:49 +0100 Subject: added STRIP-option for gentoo see http://www.vdr-portal.de/board/thread.php?postid=905301#post905301 --- tools/convpic/Makefile | 2 +- tools/crtfont/Makefile | 2 +- tools/genfont/Makefile | 2 +- tools/lcdtestpattern/Makefile | 2 +- tools/showpic/Makefile | 2 +- tools/showtext/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/convpic/Makefile b/tools/convpic/Makefile index 3932e5f..da5494b 100644 --- a/tools/convpic/Makefile +++ b/tools/convpic/Makefile @@ -36,7 +36,7 @@ $(PRGNAME): $(OBJS) install: $(PRGNAME) install -d $(BINDIR) - install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR) + install -m 755 -o root -g root $(STRIP) $(PRGNAME) $(BINDIR) uninstall: rm -f $(BINDIR)/$(PRGNAME) diff --git a/tools/crtfont/Makefile b/tools/crtfont/Makefile index bcd100f..592d123 100644 --- a/tools/crtfont/Makefile +++ b/tools/crtfont/Makefile @@ -35,7 +35,7 @@ $(PRGNAME): $(OBJS) install: $(PRGNAME) install -d $(BINDIR) - install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR) + install -m 755 -o root -g root $(STRIP) $(PRGNAME) $(BINDIR) uninstall: rm -f $(BINDIR)/$(PRGNAME) diff --git a/tools/genfont/Makefile b/tools/genfont/Makefile index 14837b0..e516a21 100644 --- a/tools/genfont/Makefile +++ b/tools/genfont/Makefile @@ -38,7 +38,7 @@ $(PRGNAME): $(OBJS) install: $(PRGNAME) install -d $(BINDIR) - install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR) + install -m 755 -o root -g root $(STRIP) $(PRGNAME) $(BINDIR) uninstall: rm -f $(BINDIR)/$(PRGNAME) diff --git a/tools/lcdtestpattern/Makefile b/tools/lcdtestpattern/Makefile index 504e27c..51b1123 100644 --- a/tools/lcdtestpattern/Makefile +++ b/tools/lcdtestpattern/Makefile @@ -36,7 +36,7 @@ $(PRGNAME): $(OBJS) install: $(PRGNAME) install -d $(BINDIR) - install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR) + install -m 755 -o root -g root $(STRIP) $(PRGNAME) $(BINDIR) uninstall: rm -f $(BINDIR)/$(PRGNAME) diff --git a/tools/showpic/Makefile b/tools/showpic/Makefile index 5d15d61..52c1850 100644 --- a/tools/showpic/Makefile +++ b/tools/showpic/Makefile @@ -36,7 +36,7 @@ $(PRGNAME): $(OBJS) install: $(PRGNAME) install -d $(BINDIR) - install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR) + install -m 755 -o root -g root $(STRIP) $(PRGNAME) $(BINDIR) uninstall: rm -f $(BINDIR)/$(PRGNAME) diff --git a/tools/showtext/Makefile b/tools/showtext/Makefile index d0d963a..d43c986 100644 --- a/tools/showtext/Makefile +++ b/tools/showtext/Makefile @@ -36,7 +36,7 @@ $(PRGNAME): $(OBJS) install: $(PRGNAME) install -d $(BINDIR) - install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR) + install -m 755 -o root -g root $(STRIP) $(PRGNAME) $(BINDIR) uninstall: rm -f $(BINDIR)/$(PRGNAME) -- cgit v1.2.3 From 379c2fefdeb4ae8d55add2d9ae44ea274cb7937b Mon Sep 17 00:00:00 2001 From: Zoolooc Date: Mon, 7 Mar 2011 14:35:38 +0100 Subject: memory cleanups --- tools/showpic/showpic.c | 1 + tools/showtext/showtext.c | 1 + 2 files changed, 2 insertions(+) (limited to 'tools') diff --git a/tools/showpic/showpic.c b/tools/showpic/showpic.c index f17f361..ebeb73f 100644 --- a/tools/showpic/showpic.c +++ b/tools/showpic/showpic.c @@ -219,6 +219,7 @@ int main(int argc, char *argv[]) if (glcd.Load(image, picFile) == false) { fprintf(stderr, "ERROR: Failed loading file %s\n", picFile.c_str()); + delete lcd; return 8; } diff --git a/tools/showtext/showtext.c b/tools/showtext/showtext.c index 2621db1..333d9e3 100644 --- a/tools/showtext/showtext.c +++ b/tools/showtext/showtext.c @@ -274,6 +274,7 @@ int main(int argc, char *argv[]) lcd->DeInit(); delete lcd; + delete bitmap; return 0; } -- cgit v1.2.3