| 1 |
Index: lshw-B.02.16/src/core/Makefile
|
| 2 |
===================================================================
|
| 3 |
--- lshw-B.02.16.orig/src/core/Makefile
|
| 4 |
+++ lshw-B.02.16/src/core/Makefile
|
| 5 |
@@ -1,10 +1,9 @@
|
| 6 |
PACKAGENAME?=lshw
|
| 7 |
|
| 8 |
-CXX=c++
|
| 9 |
+CXX?=c++
|
| 10 |
INCLUDES=
|
| 11 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
|
| 12 |
-CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
| 13 |
-LDFLAGS=
|
| 14 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
| 15 |
LDSTATIC=
|
| 16 |
LIBS=
|
| 17 |
|
| 18 |
Index: lshw-B.02.16/src/gui/Makefile
|
| 19 |
===================================================================
|
| 20 |
--- lshw-B.02.16.orig/src/gui/Makefile
|
| 21 |
+++ lshw-B.02.16/src/gui/Makefile
|
| 22 |
@@ -1,5 +1,7 @@
|
| 23 |
PACKAGENAME?=lshw
|
| 24 |
|
| 25 |
+SQLITE?=0
|
| 26 |
+
|
| 27 |
CXX?=c++
|
| 28 |
CC?=cc
|
| 29 |
STRIP?=strip
|
| 30 |
@@ -8,13 +10,14 @@ OBJCOPY?=objcopy
|
| 31 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
|
| 32 |
GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
|
| 33 |
INCLUDES=-I../core $(GTKINCLUDES)
|
| 34 |
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
| 35 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
| 36 |
CFLAGS=$(CXXFLAGS) $(DEFINES)
|
| 37 |
GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
|
| 38 |
-LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
|
| 39 |
-LDFLAGS=
|
| 40 |
-ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
|
| 41 |
- LDFLAGS+= -Wl,--as-needed
|
| 42 |
+LIBS=-L../core -llshw -lresolv $(GTKLIBS)
|
| 43 |
+
|
| 44 |
+ifeq ($(SQLITE), 1)
|
| 45 |
+ CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
|
| 46 |
+ LIBS+= $(shell pkg-config --libs sqlite3)
|
| 47 |
endif
|
| 48 |
|
| 49 |
OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o
|
| 50 |
@@ -39,8 +42,7 @@ gtk-$(PACKAGENAME): $(OBJS) ../core/libl
|
| 51 |
$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
|
| 52 |
|
| 53 |
install: all
|
| 54 |
- $(STRIP) gtk-$(PACKAGENAME)
|
| 55 |
-
|
| 56 |
+
|
| 57 |
clean:
|
| 58 |
rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak
|
| 59 |
|
| 60 |
Index: lshw-B.02.16/src/Makefile
|
| 61 |
===================================================================
|
| 62 |
--- lshw-B.02.16.orig/src/Makefile
|
| 63 |
+++ lshw-B.02.16/src/Makefile
|
| 64 |
@@ -21,11 +21,11 @@ export SQLITE
|
| 65 |
CXX?=c++
|
| 66 |
INCLUDES=-I./core/
|
| 67 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
|
| 68 |
-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
| 69 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
| 70 |
ifeq ($(SQLITE), 1)
|
| 71 |
CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
|
| 72 |
endif
|
| 73 |
-LDFLAGS=-L./core/ -g
|
| 74 |
+LDFLAGS += -L./core/
|
| 75 |
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
|
| 76 |
LDFLAGS+= -Wl,--as-needed
|
| 77 |
endif
|
| 78 |
@@ -39,7 +39,7 @@ export CXXFLAGS
|
| 79 |
export LIBS
|
| 80 |
export LDFLAGS
|
| 81 |
|
| 82 |
-DATAFILES = pci.ids usb.ids oui.txt manuf.txt
|
| 83 |
+DATAFILES = oui.txt manuf.txt
|
| 84 |
|
| 85 |
all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
|
| 86 |
|
| 87 |
@@ -48,18 +48,18 @@ all: $(PACKAGENAME) $(PACKAGENAME).1 $(D
|
| 88 |
|
| 89 |
.PHONY: core
|
| 90 |
core:
|
| 91 |
- +make -C core all
|
| 92 |
+ $(MAKE) -C core all
|
| 93 |
|
| 94 |
$(PACKAGENAME): core $(PACKAGENAME).o
|
| 95 |
$(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
|
| 96 |
|
| 97 |
.PHONY: po
|
| 98 |
po:
|
| 99 |
- +make -C po all
|
| 100 |
+ $(MAKE) -C po all
|
| 101 |
|
| 102 |
.PHONY: gui
|
| 103 |
gui: core
|
| 104 |
- +make -C gui all
|
| 105 |
+ $(MAKE) -C gui all
|
| 106 |
|
| 107 |
.PHONY: nologo
|
| 108 |
nologo:
|
| 109 |
@@ -70,7 +70,6 @@ static: $(PACKAGENAME)-static
|
| 110 |
|
| 111 |
$(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
|
| 112 |
$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
|
| 113 |
- $(STRIP) $@
|
| 114 |
|
| 115 |
.PHONY: compressed
|
| 116 |
compressed: $(PACKAGENAME)-compressed
|
| 117 |
@@ -93,14 +92,14 @@ oui.txt:
|
| 118 |
manuf.txt:
|
| 119 |
wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
|
| 120 |
|
| 121 |
-install: all
|
| 122 |
+install:
|
| 123 |
$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
|
| 124 |
$(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
|
| 125 |
$(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
|
| 126 |
$(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
|
| 127 |
$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
|
| 128 |
$(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
|
| 129 |
- make -C po install
|
| 130 |
+ $(MAKE) -C po install
|
| 131 |
|
| 132 |
install-gui: gui
|
| 133 |
$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
|
| 134 |
@@ -112,8 +111,8 @@ install-gui: gui
|
| 135 |
|
| 136 |
clean:
|
| 137 |
rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
|
| 138 |
- make -C core clean
|
| 139 |
- make -C gui clean
|
| 140 |
+ $(MAKE) -C core clean
|
| 141 |
+ $(MAKE) -C gui clean
|
| 142 |
|
| 143 |
.timestamp:
|
| 144 |
date --utc +%Y%m%d%H%M%S > $@
|
Parent Directory
| 
Revision Log