[patch] lshw-02.08.01b-build.patch

lshw-02.08.01b-build.patch (text/plain), 2.56 KB, created by Daniel Pielmeier on 2007-08-12 18:50:36 UTC

--- lshw-B.02.11.01.orig/src/core/Makefile	2007-08-12 19:36:13.000000000 +0200
+++ lshw-B.02.11.01/src/core/Makefile	2007-08-12 20:01:15.000000000 +0200
@@ -1,9 +1,10 @@
 PACKAGENAME?=lshw
 
-CXX=c++
+CXX ?= c++
 INCLUDES=
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+CXXFLAGS ?= -g -Os
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
 LDFLAGS=
 LDSTATIC=
 LIBS=
--- lshw-B.02.11.01.orig/src/gui/Makefile	2007-08-12 19:36:14.000000000 +0200
+++ lshw-B.02.11.01/src/gui/Makefile	2007-08-12 20:07:45.000000000 +0200
@@ -1,17 +1,18 @@
 PACKAGENAME?=lshw
 
-CXX?=c++
-CC?=cc
-STRIP?=strip
+CXX ?= c++
+CC ?= cc
 
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
 GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
 INCLUDES=-I../core $(GTKINCLUDES)
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-CFLAGS=$(CXXFLAGS) $(DEFINES)
+CXXFLAGS ?= -g -Os
+CFLAGS ?= $(CXXFLAGS)
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+CFLAGS += -Wall $(INCLUDES) $(DEFINES)
 GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
 LIBS=-L../core -llshw $(GTKLIBS)
-LDFLAGS=
+LDFLAGS ?= -Os -s
 ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
 	LDFLAGS+= -Wl,--as-needed
 endif
@@ -34,7 +35,6 @@
 	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 install: all
-	$(STRIP) gtk-$(PACKAGENAME)
 	
 clean:
 	rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak interface.c.bak interface.h.bak callbacks.c.bak callbacks.h.bak Makefile.bak
--- lshw-B.02.11.01.orig/src/Makefile	2007-08-12 19:36:14.000000000 +0200
+++ lshw-B.02.11.01/src/Makefile	2007-08-12 20:08:39.000000000 +0200
@@ -8,18 +8,19 @@
 MANDIR=$(PREFIX)/share/man
 DATADIR=$(PREFIX)/share
 INSTALL?=install -p
-STRIP?=strip
 export DESTDIR
 export PREFIX
 export SBINDIR
 export MANDIR
 export DATADIR
 
-CXX?=c++
+CXX ?= c++
 INCLUDES=-I./core/
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-LDFLAGS=-L./core/ -g
+CXXFLAGS ?= -g -Os
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+LDFLAGS ?= -s
+LDFLAGS += -L./core/
 ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
 	LDFLAGS+= -Wl,--as-needed
 endif
@@ -49,7 +50,6 @@
 
 $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
 	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-	$(STRIP) $@
 
 .PHONY: compressed
 compressed: $(PACKAGENAME)-compressed