openkylin
/
lshw
mirror of https://gitee.com/openkylin/lshw.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

make pkg-config subtitutable 

Gbp-Pq: Name cross.patch
This commit is contained in:
Helmut Grohne 2022-06-27 14:59:29 +08:00 committed by Lu zhiping
parent b7b57dbbb6
commit 4182469fa0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile
View File

@ -21,14 +21,15 @@ export SQLITE
export ZLIB export ZLIB
CXX?=$(CROSS_COMPILE)c++ CXX?=$(CROSS_COMPILE)c++
PKG_CONFIG ?= pkg-config
INCLUDES=-I./core/ INCLUDES=-I./core/
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\" DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\"
CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES)
ifeq ($(SQLITE), 1) ifeq ($(SQLITE), 1)
CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3)
endif endif
ifeq ($(ZLIB), 1) ifeq ($(ZLIB), 1)
CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib) CXXFLAGS+= -DZLIB $(shell $(PKG_CONFIG) --cflags zlib)
endif endif
LDFLAGS+=-L./core/ LDFLAGS+=-L./core/
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
@ -37,10 +38,10 @@ endif
LDSTATIC=-static LDSTATIC=-static
LIBS+=-llshw -lresolv LIBS+=-llshw -lresolv
ifeq ($(SQLITE), 1) ifeq ($(SQLITE), 1)
LIBS+= $(shell pkg-config --libs sqlite3) LIBS+= $(shell $(PKG_CONFIG) --libs sqlite3)
endif endif
ifeq ($(ZLIB), 1) ifeq ($(ZLIB), 1)
LIBS+= $(shell pkg-config --libs zlib) LIBS+= $(shell $(PKG_CONFIG) --libs zlib)
endif endif
export CXXFLAGS export CXXFLAGS

9
src/gui/Makefile
View File

@ -1,22 +1,23 @@
PACKAGENAME?=lshw PACKAGENAME?=lshw
CXX?=$(CROSS_COMPILE)c++ CXX?=$(CROSS_COMPILE)c++
PKG_CONFIG ?= pkg-config
CC?=$(CROSS_COMPILE)cc CC?=$(CROSS_COMPILE)cc
STRIP?=strip STRIP?=strip
OBJCOPY?=objcopy OBJCOPY?=objcopy
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) GTKINCLUDES=$(shell $(PKG_CONFIG) gtk+-2.0 --cflags)
INCLUDES=-I../core $(GTKINCLUDES) INCLUDES=-I../core $(GTKINCLUDES)
CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES)
ifeq ($(SQLITE), 1) ifeq ($(SQLITE), 1)
CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3)
endif endif
CFLAGS=$(CXXFLAGS) $(DEFINES) CFLAGS=$(CXXFLAGS) $(DEFINES)
GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) GTKLIBS=$(shell $(PKG_CONFIG) gtk+-2.0 gmodule-2.0 --libs)
LIBS+=-L../core -llshw -lresolv $(GTKLIBS) LIBS+=-L../core -llshw -lresolv $(GTKLIBS)
ifeq ($(SQLITE), 1) ifeq ($(SQLITE), 1)
LIBS+= $(shell pkg-config --libs sqlite3) LIBS+= $(shell $(PKG_CONFIG) --libs sqlite3)
endif endif
LDFLAGS= LDFLAGS=
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )