Attachment #127890 for bug #188624

Lines 1-9 Link Here

(-)lshw-B.02.11.01.orig/src/core/Makefile (-2 / +3 lines)
1	PACKAGENAME?=lshw	1	PACKAGENAME?=lshw
2		2
3	CXX=c++	3	CXX ?= c++
4	INCLUDES=	4	INCLUDES=
5	DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"	5	DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
6	CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)	6	CXXFLAGS ?= -g -Os
		7	CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
7	LDFLAGS=	8	LDFLAGS=
8	LDSTATIC=	9	LDSTATIC=
9	LIBS=	10	LIBS=




PACKAGENAME?=lshw

CXX ?= c++
CC ?= cc
STRIP?=strip

DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
INCLUDES=-I../core $(GTKINCLUDES)
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 ?= -Os -s
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
	LDFLAGS+= -Wl,--as-needed
endif

	$(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




MANDIR=$(PREFIX)/share/man
DATADIR=$(PREFIX)/share
INSTALL?=install -p
STRIP?=strip
export DESTDIR
export PREFIX
export SBINDIR
export MANDIR
export DATADIR

CXX ?= c++
INCLUDES=-I./core/
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
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


$(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
	$(STRIP) $@

.PHONY: compressed
compressed: $(PACKAGENAME)-compressed

Return to bug 188624

Lines 1-17 Link Here

(-)lshw-B.02.11.01.orig/src/gui/Makefile (-7 / +7 lines)
1	PACKAGENAME?=lshw	1	PACKAGENAME?=lshw
2		2
3	CXX?=c++	3	CXX ?= c++
4	CC?=cc	4	CC ?= cc
5	STRIP?=strip
6		5
7	DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"	6	DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
8	GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)	7	GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
9	INCLUDES=-I../core $(GTKINCLUDES)	8	INCLUDES=-I../core $(GTKINCLUDES)
10	CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)	9	CXXFLAGS ?= -g -Os
11	CFLAGS=$(CXXFLAGS) $(DEFINES)	10	CFLAGS ?= $(CXXFLAGS)
		11	CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
		12	CFLAGS += -Wall $(INCLUDES) $(DEFINES)
12	GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)	13	GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
13	LIBS=-L../core -llshw $(GTKLIBS)	14	LIBS=-L../core -llshw $(GTKLIBS)
14	LDFLAGS=	15	LDFLAGS ?= -Os -s
15	ifneq ($(shell $(LD) --help 2\| grep -- --as-needed), )	16	ifneq ($(shell $(LD) --help 2\| grep -- --as-needed), )
16	LDFLAGS+= -Wl,--as-needed	17	LDFLAGS+= -Wl,--as-needed
17	endif	18	endif
Lines 34-40 Link Here
34	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)	35	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
35		36
36	install: all	37	install: all
37	$(STRIP) gtk-$(PACKAGENAME)
38		38
39	clean:	39	clean:
40	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	40	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

Lines 8-25 Link Here

(-)lshw-B.02.11.01.orig/src/Makefile (-5 / +5 lines)
8	MANDIR=$(PREFIX)/share/man	8	MANDIR=$(PREFIX)/share/man
9	DATADIR=$(PREFIX)/share	9	DATADIR=$(PREFIX)/share
10	INSTALL?=install -p	10	INSTALL?=install -p
11	STRIP?=strip
12	export DESTDIR	11	export DESTDIR
13	export PREFIX	12	export PREFIX
14	export SBINDIR	13	export SBINDIR
15	export MANDIR	14	export MANDIR
16	export DATADIR	15	export DATADIR
17		16
18	CXX?=c++	17	CXX ?= c++
19	INCLUDES=-I./core/	18	INCLUDES=-I./core/
20	DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"	19	DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
21	CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)	20	CXXFLAGS ?= -g -Os
22	LDFLAGS=-L./core/ -g	21	CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
		22	LDFLAGS ?= -s
		23	LDFLAGS += -L./core/
23	ifneq ($(shell $(LD) --help 2\| grep -- --as-needed), )	24	ifneq ($(shell $(LD) --help 2\| grep -- --as-needed), )
24	LDFLAGS+= -Wl,--as-needed	25	LDFLAGS+= -Wl,--as-needed
25	endif	26	endif
Lines 49-55 Link Here
49		50
50	$(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o	51	$(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
51	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)	52	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
52	$(STRIP) $@
53		53
54	.PHONY: compressed	54	.PHONY: compressed
55	compressed: $(PACKAGENAME)-compressed	55	compressed: $(PACKAGENAME)-compressed