From a43ffe12212e1a4dd7b0038197b53798d7a3dfb1 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terje.rosten@ntnu.no>

Date: Mon, 2 Apr 2018 14:51:55 +0200

Subject: [PATCH] cmakeify

---

 CMakeLists.txt                                     |  42 ++++++

 Makefile                                           |  20 ---

 README.md                                          |  47 ++++---

 lshw.spec.in                                       |  52 ++------

 src/CMakeLists.txt                                 | 103 +++++++++++++++

 src/Makefile                                       | 144 ---------------------

 src/core/Makefile                                  |  80 ------------

 src/core/{config.h => config.h.in}                 |  28 ++--

 src/core/db.cc                                     |   8 ++

 src/core/dump.cc                                   |   2 +-

 src/core/version.h                                 |   2 +

 src/gui/CMakeLists.txt                             |  67 ++++++++++

 src/gui/Makefile                                   |  61 ---------

 .../{gtk-lshw.desktop => gtk-lshw.desktop.in}      |   7 +-

 src/gui/integration/lshw-gui.in                    |   5 +

 src/gui/integration/org.ezix.lshw.gui.policy.in    |  20 +++

 src/gui/stock.c                                    |   1 +

 src/po/CMakeLists.txt                              |  16 +++

 src/po/Makefile                                    |  23 ----

 19 files changed, 317 insertions(+), 411 deletions(-)

 create mode 100644 CMakeLists.txt

 delete mode 100644 Makefile

 create mode 100644 src/CMakeLists.txt

 delete mode 100644 src/Makefile

 delete mode 100644 src/core/Makefile

 rename src/core/{config.h => config.h.in} (50%)

 create mode 100644 src/gui/CMakeLists.txt

 delete mode 100644 src/gui/Makefile

 rename src/gui/integration/{gtk-lshw.desktop => gtk-lshw.desktop.in} (51%)

 create mode 100644 src/gui/integration/lshw-gui.in

 create mode 100644 src/gui/integration/org.ezix.lshw.gui.policy.in

 create mode 100644 src/po/CMakeLists.txt

 delete mode 100644 src/po/Makefile

diff --git a/CMakeLists.txt b/CMakeLists.txt

new file mode 100644

index 0000000..6c69c37

--- /dev/null

+++ b/CMakeLists.txt

@@ -0,0 +1,42 @@

+cmake_minimum_required(VERSION 3.0)

+

+project(lshw)

+set(VERSION "B.012.18")

+

+IF(EXISTS "${PROJECT_SOURCE_DIR}/.git")

+  find_package(Git)

+  if(GIT_FOUND)

+    execute_process(

+      COMMAND ${GIT_EXECUTABLE} describe --tags

+      OUTPUT_VARIABLE DESCRIBE_TAG

+      OUTPUT_STRIP_TRAILING_WHITESPACE)

+    string(REGEX MATCH "B.[0-9]+.[0-9]+[-][0-9]+" VERSION ${DESCRIBE_TAG})

+    string(REPLACE "-" "." VERSION ${VERSION})

+  endif()

+endif()

+

+message("-- lshw: ${VERSION}")

+

+option(GUI "Enable GUI application (${PROJECT_NAME}-gtk)" ON)

+option(HWDATA "Install hwdata files" ON)

+option(SQLITE "Enable SQLite support" OFF)

+option(ZLIB "Enable zlib support" OFF)

+option(NOLOGO "Don't install vendor logos" OFF)

+option(STATIC "Do a static (will disable other features)" OFF)

+option(POLICYKIT "Install PolicyKit file and pfexec wrapper" OFF)

+

+include(GNUInstallDirs)

+set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Install prefix")

+set(DATADIR "${CMAKE_INSTALL_FULL_DATADIR}")

+set(PROJECT_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}")

+set(SBINDIR "${CMAKE_INSTALL_FULL_SBINDIR}")

+set(MANDIR "${CMAKE_INSTALL_FULL_MANDIR}")

+set(LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")

+

+configure_file(

+  "${PROJECT_SOURCE_DIR}/lshw.spec.in"

+  "${PROJECT_BINARY_DIR}/lshw.spec")

+

+add_subdirectory(src)

+add_subdirectory(src/po)

+add_subdirectory(src/gui)

diff --git a/Makefile b/Makefile

deleted file mode 100644

index 8fe665e..0000000

--- a/Makefile

+++ /dev/null

@@ -1,20 +0,0 @@

-PACKAGENAME = lshw

-VERSION?= $(shell git describe --tags | cut -d - -f 1,2 | tr - .)

-export PACKAGENAME

-

-all clean install snapshot gui install-gui:

-	+$(MAKE) -C src $@

-

-version.cpe: .version

-	echo -n cpe:/a:ezix:$(PACKAGENAME): > $@

-	cat $^ >> $@

-

-.PHONY: $(PACKAGENAME).spec

-

-$(PACKAGENAME).spec: $(PACKAGENAME).spec.in

-	cat $^ | sed -e s/\@VERSION\@/$(VERSION)/g > $@

-

-release: $(PACKAGENAME).spec

-	git archive --prefix=$(PACKAGENAME)-$(VERSION)/ -o $(PACKAGENAME)-$(VERSION).tar HEAD

-	tar --transform s!^!$(PACKAGENAME)-$(VERSION)/! -rf $(PACKAGENAME)-$(VERSION).tar $^

-	gzip -f $(PACKAGENAME)-$(VERSION).tar

diff --git a/README.md b/README.md

index 7afcae6..393da0f 100644

--- a/README.md

+++ b/README.md

@@ -15,27 +15,25 @@ Installation

  1. Requirements

    - Linux 2.4.x, 2.6.x, 3.x or 4.x (2.2.x might work, though)

    - a PA-RISC-, Alpha-, IA-64- (Itanium-), PowerPC-, ARM- or x86- based machine

+   - cmake, GNU make or Ninja

    - an ANSI (or close enough to ANSI compliance) C++ compiler (tested with g++ 2.95.4 and 3.x)

    - for the (optional) GTK+ graphical user interface, you will need a

 	complete GTK+ development environment (gtk2-devel on RedHat/Fedora derivatives) 

+   - for optional SQLite feature install SQLite

+   - for optional zlib feature install zlib and gzip

- 2. To compile it, just use:

+ 2. Use cmake options to adjust non default set:

+     -DGUI=OFF, -DZLIB=ON, -DSQLITE=ON and/or -DNOLOGO=ON

-    	$ make

+ 3. Do configuration and build by

-    To complile with zlib support (see below), use:

-

-    	$ make ZLIB=1

-

- 3. If you want to build the optional GUI, do:

-

-    	$ make

-    	$ make gui

+       $ mkdir build && cd build

+       $ cmake .. -GNinja <options>

+       $ ninja-build

  4. If you want to install the result, do:

-    	$ make install

-    	$ make install-gui

+       $ ninja-build install

 Getting help

 ------------

@@ -61,12 +59,27 @@ If compiled with zlib support, lshw will look for `file`.gz first, then for `fil

 Statically-linked and/or compressed binaries can be built by using

-    $ make static

-

+    $ mkdir build && cd build

+    $ cmake .. -DSTATIC=ON

+    $ ninja

 or

+    $ mkdir build && cd build

+    $ cmake .. -GNinja

+    $ ninja compressed

-    $ make compressed

+Building compressed binaries requires `upx` (cf. https://upx.github.io/).

-in the `src/` directory

+Release and maintenance

+-----------------------

-Building compressed binaries requires `upx` (cf. https://upx.github.io/).

+Create release tarball,

+

+ 1. Edit CMakeLists.txt to set version

+ 2. Run

+    $ mkdir build && cd build

+    $ cmake .. -GNinja

+    $ ninja release

+

+Update hwdata files:

+

+    $ ninja refresh_hwdata

diff --git a/lshw.spec.in b/lshw.spec.in

index c597379..a7655f5 100644

--- a/lshw.spec.in

+++ b/lshw.spec.in

@@ -52,49 +52,17 @@ http://lshw.ezix.org/

 %setup -q

 %build

-%{__make} %{?_smp_mflags} \

-  PREFIX="%{_prefix}" \

-  SBINDIR="%{_sbindir}" \

-  MANDIR="%{_mandir}" \

-  DATADIR="%{_datadir}" \

-  all

-%if %{!?_without_gui:1}0

-%{__make} %{?_smp_mflags} \

-  PREFIX="%{_prefix}" \

-  SBINDIR="%{_sbindir}" \

-  MANDIR="%{_mandir}" \

-  DATADIR="%{_datadir}" \

-  gui

-%endif

+mkdir build && cd build

+%cmake .. %{?_without_gui:-DGUI=OFF}

+make %{?_smp_mflags} VERBOSE=1

 %install

-%{__rm} -rf "%{buildroot}"

-

-%{__make} \

-  DESTDIR="%{buildroot}" \

-  PREFIX="%{_prefix}" \

-  SBINDIR="%{_sbindir}" \

-  MANDIR="%{_mandir}" \

-  DATADIR="%{_datadir}" \

-  INSTALL="%{__install} -p" \

-  install

-%if %{!?_without_gui:1}0

-%{__make} \

-  DESTDIR="%{buildroot}" \

-  PREFIX="%{_prefix}" \

-  SBINDIR="%{_sbindir}" \

-  MANDIR="%{_mandir}" \

-  DATADIR="%{_datadir}" \

-  INSTALL="%{__install} -p" \

-  install-gui

-%endif

-

-%clean

-%{__rm} -rf %{buildroot}

+cd build

+make install DESTDIR=%{buildroot}

 %files

-%defattr(-,root,root, 0555)

-%doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd

+%license COPYING

+%doc COPYING docs/TODO docs/Changelog docs/lshw.xsd

 %{_sbindir}/lshw

 %doc %{_mandir}/man?/*

 %{_datadir}/lshw/

@@ -102,9 +70,11 @@ http://lshw.ezix.org/

 %if %{!?_without_gui:1}0

 %files gui

-%defattr(-,root,root, 0555)

-%doc COPYING

+%license COPYING

 %{_sbindir}/gtk-lshw

+%{_datadir}/appdata/gtk-lshw.appdata.xml

+%{_datadir}/applications/gtk-lshw.desktop

+%{_datadir}/pixmaps/gtk-lshw.svg

 %endif

 %changelog

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

new file mode 100644

index 0000000..ab559d9

--- /dev/null

+++ b/src/CMakeLists.txt

@@ -0,0 +1,103 @@

+if(STATIC)

+ set(ZLIB OFF)

+ set(SQLITE OFF)

+endif()

+

+# SQLite support

+if(SQLITE)

+  pkg_check_modules(SQLITE3 sqlite3)

+  if(SQLITE3_FOUND)

+    message("-- Enabling SQLite support")

+  else()

+    message(FATAL_ERROR "SQLite not found, install lib or disable feature: -DSQLITE=OFF")

+  endif()

+else()

+  message("-- SQLite support disabled")

+endif()

+

+# zlib support

+if(ZLIB)

+  find_program(GZIP gzip "Path to gzip application")

+  if(NOT GZIP)

+    message(FATAL_ERROR "gzip program not found, install gzip or disable zlib support: -DZLIB=OFF")

+  endif()

+  pkg_check_modules(Z zlib)

+  if(Z_FOUND)

+    message("-- Enabling zlib support")

+  else()

+    message(FATAL_ERROR "zlib not found, install lib or disable feature: -DZLIB=OFF")

+  endif()

+else()

+  message("-- zlib support disabled")

+endif()

+

+if(ERROR)

+  message(FATAL_ERROR "Configuration failed")

+endif()

+

+# Some special targets, compress, refresh_hwdata and release

+add_custom_target(compressed

+  COMMAND upx -9 -o lshw-compress lshw

+  COMMENT "Creating upx compressed binary")

+add_dependencies(compressed lshw)

+

+add_custom_target(refresh_hwdata

+  COMMAND wget -N http://pciids.sourceforge.net/pci.ids

+  COMMAND wget -N http://www.linux-usb.org/usb.ids

+  COMMAND wget -N http://standards-oui.ieee.org/oui/oui.txt

+  COMMAND wget -O manuf.txt http://anonsvn.wireshark.org/wireshark/trunk/manuf

+  COMMAND wget -N https://git.fedorahosted.org/cgit/hwdata.git/plain/pnp.ids

+  COMMAND wget -N http://www-pc.uni-regensburg.de/hardware/TECHNIK/PCI_PNP/pnpid.txt

+  WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/src"

+  COMMENT "Updating hwdata files from upstream location")

+

+set(TARNAME ${PROJECT_NAME}-${VERSION})

+add_custom_target(release

+  COMMAND ${GIT_EXECUTABLE} archive --prefix=${TARNAME}/

+    -o ${PROJECT_BINARY_DIR}/${TARNAME}.tar HEAD

+  COMMAND mv ${PROJECT_BINARY_DIR}/lshw.spec ${PROJECT_SOURCE_DIR}/lshw.spec

+  COMMAND tar --owner=0 --group=0

+    --transform s,lshw.spec,${TARNAME}/lshw.spec,

+    -rf ${PROJECT_BINARY_DIR}/${TARNAME}.tar lshw.spec

+  COMMAND gzip ${PROJECT_BINARY_DIR}/${TARNAME}.tar

+  COMMAND rm ${PROJECT_SOURCE_DIR}/lshw.spec

+  WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"

+  COMMENT "Creating release tarball")

+

+configure_file(

+  "${CMAKE_CURRENT_SOURCE_DIR}/core/config.h.in"

+  "${PROJECT_BINARY_DIR}/config.h")

+

+include_directories("${PROJECT_BINARY_DIR}")

+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/core")

+

+file(GLOB DATAFILES "pci.ids" "pnp.ids" "usb.ids" "manuf.txt" "oui.txt" "pnpid.txt")

+

+file(GLOB SOURCES "core/*.cc")

+add_library(core ${SOURCES})

+add_executable(lshw lshw.cc)

+

+if(STATIC)

+  set_target_properties(lshw PROPERTIES LINK_FLAGS "-static" )

+endif()

+

+target_link_libraries(lshw ${SQLITE3_LIBRARIES} ${Z_LIBRARIES} resolv core)

+

+if(NOT ZLIB)

+  if(HWDATA)

+    install(FILES ${DATAFILES} DESTINATION ${PROJECT_DATADIR})

+  endif()

+else()

+  foreach(DATAFILE ${DATAFILES})

+    get_filename_component(FILE ${DATAFILE} NAME)

+    add_custom_command(

+      OUTPUT ${FILE}.gz

+      COMMAND ${GZIP} -c ${DATAFILE} > ${FILE}.gz)

+    add_custom_target(${FILE} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.gz)

+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.gz DESTINATION ${PROJECT_DATADIR})

+  endforeach()

+endif()

+

+install(FILES lshw.1 DESTINATION ${MANDIR}/man1 COMPONENT doc)

+install(TARGETS lshw DESTINATION sbin)

+

diff --git a/src/Makefile b/src/Makefile

deleted file mode 100644

index 917bf6b..0000000

--- a/src/Makefile

+++ /dev/null

@@ -1,144 +0,0 @@

-PACKAGENAME:=lshw

-export PACKAGENAME

-VERSION?= $(shell git describe --tags --long | cut -d - -f 1,2 | tr - .)

-

-SQLITE?=0

-ZLIB?=0

-

-DESTDIR?=/

-PREFIX?=/usr

-SBINDIR=$(PREFIX)/sbin

-MANDIR=$(PREFIX)/share/man

-DATADIR=$(PREFIX)/share

-INSTALL?=install -p

-STRIP?=strip

-export DESTDIR

-export PREFIX

-export SBINDIR

-export MANDIR

-export DATADIR

-export SQLITE

-export ZLIB

-

-CXX?=c++

-INCLUDES=-I./core/

-DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\"

-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)

-ifeq ($(SQLITE), 1)

-	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)

-endif

-ifeq ($(ZLIB), 1)

-	CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib)

-endif

-LDFLAGS=-L./core/ -g

-ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )

-	LDFLAGS+= -Wl,--as-needed

-endif

-LDSTATIC=-static

-LIBS+=-llshw -lresolv

-ifeq ($(SQLITE), 1)

-	LIBS+= $(shell pkg-config --libs sqlite3)

-endif

-ifeq ($(ZLIB), 1)

-	LIBS+= $(shell pkg-config --libs zlib)

-endif

-

-export CXXFLAGS

-export LIBS

-export LDFLAGS

-

-ifeq ($(ZLIB), 1)

-DATAFILES = pci.ids.gz usb.ids.gz oui.txt.gz manuf.txt.gz pnp.ids.gz pnpid.txt.gz

-else

-DATAFILES = pci.ids usb.ids oui.txt manuf.txt pnp.ids pnpid.txt

-endif

-

-all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)

-

-.cc.o:

-	$(CXX) $(CXXFLAGS) -c $< -o $@

-

-%.gz: %

-	gzip -c $< > $@

-

-.PHONY: core

-core:

-	+make -C core all

-

-$(PACKAGENAME): core $(PACKAGENAME).o

-	$(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)

-

-.PHONY: po

-po:

-	+make -C po all

-

-.PHONY: gui

-gui: core

-	+make -C gui all

-

-.PHONY: nologo

-nologo:

-	cp -f gui/artwork/nologo/* gui/artwork/

-

-.PHONY: static

-static: $(PACKAGENAME)-static

-

-$(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o

-	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)

-	$(STRIP) $@

-

-.PHONY: compressed

-compressed: $(PACKAGENAME)-compressed

-

-$(PACKAGENAME)-compressed: $(PACKAGENAME)-static

-	upx -9 -o $@ $<

-

-$(PACKAGENAME).1: $(PACKAGENAME).sgml

-	docbook2man $<

-

-pci.ids:

-	wget http://pciids.sourceforge.net/pci.ids

-

-usb.ids:

-	wget http://www.linux-usb.org/usb.ids

-

-oui.txt:

-	wget http://standards.ieee.org/regauth/oui/oui.txt

-

-manuf.txt:

-	wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf

-

-pnp.ids:

-	wget https://git.fedorahosted.org/cgit/hwdata.git/plain/pnp.ids

-

-pnpid.txt:

-	wget http://www-pc.uni-regensburg.de/hardware/TECHNIK/PCI_PNP/pnpid.txt

-

-install: all

-	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)

-	$(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)

-	$(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1

-	$(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1

-	$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)

-	$(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)

-	make -C po install

-

-install-gui: gui

-	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)

-	$(INSTALL) -m 0755 gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)

-	$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork

-	$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/ui

-	$(INSTALL) -m 0644 gui/*.ui $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/ui

-	$(INSTALL) -m 0644 gui/artwork/*.svg $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork

-	

-clean:

-	rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed

-	rm -f $(addsuffix .gz,$(DATAFILES))

-	make -C core clean

-	make -C gui clean

-

-depend:

-	@makedepend -Y $(SRCS) 2> /dev/null > /dev/null

-

-

-# DO NOT DELETE

diff --git a/src/core/Makefile b/src/core/Makefile

deleted file mode 100644

index 884a963..0000000

--- a/src/core/Makefile

+++ /dev/null

@@ -1,80 +0,0 @@

-PACKAGENAME?=lshw

-

-CXX=c++

-INCLUDES=

-DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"

-CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)

-LDFLAGS=

-LDSTATIC=

-LIBS=

-

-OBJS = hw.o main.o print.o mem.o dmi.o device-tree.o cpuinfo.o osutils.o pci.o version.o cpuid.o ide.o cdrom.o pcmcia-legacy.o scsi.o s390.o disk.o spd.o network.o isapnp.o pnp.o fb.o options.o usb.o sysfs.o display.o heuristics.o parisc.o cpufreq.o partitions.o blockio.o lvm.o ideraid.o pcmcia.o volumes.o mounts.o smp.o abi.o jedec.o dump.o fat.o virtio.o vio.o

-ifeq ($(SQLITE), 1)

-	OBJS+= db.o

-endif

-SRCS = $(OBJS:.o=.cc)

-

-all: lib$(PACKAGENAME).a

-

-.cc.o:

-	$(CXX) $(CXXFLAGS) -c $< -o $@

-

-lib$(PACKAGENAME).a: $(OBJS)

-	$(AR) rs $@ $^

-

-install: all

-	

-clean:

-	rm -f $(OBJS) lib$(PACKAGENAME).a

-

-depend:

-	@makedepend -Y $(SRCS) 2> /dev/null > /dev/null

-

-

-# DO NOT DELETE

-

-hw.o: hw.h osutils.h version.h config.h options.h heuristics.h

-main.o: hw.h print.h version.h options.h mem.h dmi.h cpuinfo.h cpuid.h

-main.o: device-tree.h pci.h pcmcia.h pcmcia-legacy.h ide.h scsi.h spd.h

-main.o: network.h isapnp.h fb.h usb.h sysfs.h display.h parisc.h cpufreq.h

-main.o: ideraid.h mounts.h smp.h abi.h s390.h virtio.h pnp.h vio.h

-print.o: print.h hw.h options.h version.h osutils.h config.h

-mem.o: version.h config.h mem.h hw.h sysfs.h

-dmi.o: version.h config.h dmi.h hw.h osutils.h

-device-tree.o: version.h device-tree.h hw.h osutils.h

-cpuinfo.o: version.h cpuinfo.h hw.h osutils.h

-osutils.o: version.h osutils.h

-pci.o: version.h config.h pci.h hw.h osutils.h options.h

-version.o: version.h config.h

-cpuid.o: version.h cpuid.h hw.h

-ide.o: version.h cpuinfo.h hw.h osutils.h cdrom.h disk.h heuristics.h

-cdrom.o: version.h cdrom.h hw.h partitions.h

-pcmcia-legacy.o: version.h pcmcia-legacy.h hw.h osutils.h

-scsi.o: version.h mem.h hw.h cdrom.h disk.h osutils.h heuristics.h sysfs.h

-disk.o: version.h disk.h hw.h osutils.h heuristics.h partitions.h

-spd.o: version.h spd.h hw.h osutils.h

-network.o: version.h config.h network.h hw.h osutils.h sysfs.h options.h

-network.o: heuristics.h

-isapnp.o: version.h isapnp.h hw.h pnp.h

-pnp.o: version.h pnp.h hw.h sysfs.h osutils.h

-fb.o: version.h fb.h hw.h

-options.o: version.h options.h osutils.h

-usb.o: version.h usb.h hw.h osutils.h heuristics.h options.h

-sysfs.o: version.h sysfs.h hw.h osutils.h

-display.o: display.h hw.h

-heuristics.o: version.h sysfs.h hw.h osutils.h

-parisc.o: version.h device-tree.h hw.h osutils.h heuristics.h

-cpufreq.o: version.h hw.h osutils.h

-partitions.o: version.h partitions.h hw.h blockio.h lvm.h volumes.h osutils.h

-blockio.o: version.h blockio.h osutils.h

-lvm.o: version.h lvm.h hw.h blockio.h osutils.h

-ideraid.o: version.h cpuinfo.h hw.h osutils.h cdrom.h disk.h heuristics.h

-pcmcia.o: version.h pcmcia.h hw.h osutils.h sysfs.h

-volumes.o: version.h volumes.h hw.h blockio.h lvm.h osutils.h

-mounts.o: version.h mounts.h hw.h osutils.h

-smp.o: version.h smp.h hw.h osutils.h

-abi.o: version.h abi.h hw.h osutils.h

-jedec.o: jedec.h

-s390.o: hw.h sysfs.h disk.h s390.h

-virtio.o: version.h hw.h sysfs.h disk.h virtio.h

-vio.o: version.h hw.h sysfs.h vio.h

diff --git a/src/core/config.h b/src/core/config.h.in

similarity index 50%

rename from src/core/config.h

rename to src/core/config.h.in

index 69023fd..ca25a5f 100644

--- a/src/core/config.h

+++ b/src/core/config.h.in

@@ -13,27 +13,15 @@

 #define N_(String) gettext_noop (String)

 #endif

-#ifndef PACKAGE

-#define PACKAGE "lshw"

-#endif

-

-#ifndef PREFIX

-#define PREFIX "/usr"

-#endif

-

-#ifndef SBINDIR

-#define SBINDIR PREFIX"/sbin"

-#endif

+#define PACKAGE "@PROJECT_NAME@"

+#define VERSION "@VERSION@"

-#ifndef DATADIR

-#define DATADIR PREFIX"/share/lshw"

-#endif

+#define SBINDIR "@SBINDIR@"

+#define DATADIR "@DATADIR@"

+#define MANDIR "@MANDIR@"

+#define LOCALEDIR "@LOCALEDIR@"

-#ifndef MANDIR

-#define MANDIR PREFIX"/share/man"

-#endif

+#cmakedefine SQLITE 1

+#cmakedefine ZLIB 1

-#ifndef LOCALEDIR

-#define LOCALEDIR PREFIX"/share/locale"

-#endif

 #endif

diff --git a/src/core/db.cc b/src/core/db.cc

index d080295..f85c85b 100644

--- a/src/core/db.cc

+++ b/src/core/db.cc

@@ -1,6 +1,12 @@

+

 #include <string.h>

 #include <string>

 #include <stdexcept>

+

+#include "config.h"

+

+#ifdef SQLITE

+

 #include <sqlite3.h>

 #include "db.h"

@@ -419,3 +425,5 @@ value statement::operator[](const string & i) const

 {

   return column(i);

 }

+

+#endif /* SQLITE */

diff --git a/src/core/dump.cc b/src/core/dump.cc

index 6bc9674..f22f0fb 100644

--- a/src/core/dump.cc

+++ b/src/core/dump.cc

@@ -1,5 +1,5 @@

-#include "dump.h"

 #include "version.h"

+#include "dump.h"

 #include "osutils.h"

 #include <time.h>

diff --git a/src/core/version.h b/src/core/version.h

index 91e039a..5cecdda 100644

--- a/src/core/version.h

+++ b/src/core/version.h

@@ -1,6 +1,8 @@

 #ifndef _VERSION_H_

 #define _VERSION_H_

+#include "config.h"

+

 #if defined(__GNUC__) || defined(__INTEL_COMPILER)

 #define __ID(string) __asm__(".ident\t\"" string "\"")

 #else

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt

new file mode 100644

index 0000000..48bd3f5

--- /dev/null

+++ b/src/gui/CMakeLists.txt

@@ -0,0 +1,67 @@

+if(NOT GUI OR STATIC)

+  message("-- gtk-${PROJECT_NAME} disabled")

+  return()

+endif()

+

+find_package(PkgConfig)

+pkg_check_modules(GTK2 REQUIRED gtk+-2.0 gmodule-2.0)

+

+file(GLOB GTK_SOURCES "*.c*")

+

+include_directories("${PROJECT_BINARY_DIR}")

+include_directories("${PROJECT_SOURCE_DIR}/src/core")

+

+include_directories("${GTK2_INCLUDE_DIRS}")