aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAgney Lopes Roth Ferraz <agney@debian.org>2007-04-09 11:45:31 -0300
committerSimon Quigley <tsimonq2@ubuntu.com>2017-06-19 14:38:41 -0500
commitadb3993ba087ede46f62d5f018e17b07e99b5260 (patch)
tree67b4fa7e224f09d21eb76060422ca23e50e6dfe0 /Makefile
parentb3e31ae3787c8806f48c85a52bba9aa3554e2c07 (diff)
parent11b8179a57e675c6672cbe649c655230ae3e9744 (diff)
Import Debian changes 0.4.2.1-1
hardinfo (0.4.2.1-1) unstable; urgency=low * New upstream release. * Fixed segfault on device entry (Closes: #387955)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile34
1 files changed, 22 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 9cbadcda..fa4b3858 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,24 @@
GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12
-GLADE_LIBS =
-GLADE_CFLAGS =
-PACKAGE = hardinfo-0.4.1
+SOUP_LIBS = -lsoup-2.2 -lglib-2.0 -lxml2 -lgnutls
+SOUP_CFLAGS = -I/usr/include/libsoup-2.2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
+PACKAGE = hardinfo-0.4.2.1
ARCHOPTS =
CC = gcc -O3 $(ARCHOPTS)
CCSLOW = gcc -O0
-CFLAGS = -fPIC -pipe -Wall -g $(GTK_CFLAGS) $(GLADE_CFLAGS) -I.
+CFLAGS = -fPIC -pipe -Wall -g $(GTK_CFLAGS) $(GLADE_CFLAGS) $(SOUP_CFLAGS) -I.
# ----------------------------------------------------------------------------
OBJECTS = hardinfo.o shell.o util.o iconcache.o loadgraph.o sha1.o md5.o \
- menu.o stock.o callbacks.o expr.o report.o blowfish.o binreloc.o
+ menu.o stock.o callbacks.o expr.o report.o blowfish.o binreloc.o \
+ vendor.o socket.o fbench.o syncmanager.o
MODULES = computer.so devices.so benchmark.so
all: $(OBJECTS) $(MODULES)
$(CC) $(CFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) $(GTK_FLAGS) \
- $(GLADE_LIBS) $(GLADE_FLAGS)
+ $(GLADE_LIBS) $(GLADE_FLAGS) $(SOUP_LIBS) $(SOUP_FLAGS)
md5.o:
$(CCSLOW) $(CFLAGS) -c md5.c -o $@
@@ -28,11 +29,20 @@ blowfish.o:
sha1.o:
$(CCSLOW) $(CFLAGS) -c sha1.c -o $@
+fbench.o:
+ $(CCSLOW) $(CFLAGS) -c fbench.c -o $@
+
+benchmark.so: benchmark.c
+ @echo "--- Module: $< ($@)"
+ $(CCSLOW) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) \
+ $(GLADE_LIBS) $(GLADE_FLAGS)
+ ln -sf ../$@ modules
+
%.so: %.c
@echo "--- Module: $< ($@)"
$(CC) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) \
$(GLADE_LIBS) $(GLADE_FLAGS)
- mv -f $@ modules
+ ln -sf ../$@ modules
clean:
rm -rf .xvpics pixmaps/.xvpics *.o *.so hardinfo modules/*.so report
@@ -67,19 +77,19 @@ install: all
cp hardinfo ${DESTDIR}/usr/bin/hardinfo
@echo '*** Installing modules...'
- cp -r modules/*.so ${DESTDIR}/usr/lib/hardinfo/modules
+ cp -Lr modules/*.so ${DESTDIR}/usr/lib/hardinfo/modules
@echo '*** Installing pixmaps...'
- cp -r pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
+ cp -Lr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
@echo '*** Installing misc data...'
- cp uidefs.xml ${DESTDIR}/usr/share/hardinfo
- cp modules.conf ${DESTDIR}/usr/share/hardinfo
cp benchmark.conf ${DESTDIR}/usr/share/hardinfo
cp benchmark.data ${DESTDIR}/usr/share/hardinfo
@echo '*** Fixing permissions...'
- #chmod -R 755 ${DESTDIR}/usr/share/hardinfo
chmod 755 ${DESTDIR}/usr/bin/hardinfo
@echo '*** Done installing.'
+
+installer:
+ makeinstaller