From 7c47b5b9584f5011aeba18d7e1b26b3d3124825f Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Mon, 19 Jun 2017 14:38:48 -0500
Subject: Import Upstream version 0.5.1

---
 Makefile.in | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 5639db69..03a9df8b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,9 +13,7 @@ BENCHMARK_OBJECTS = fbench.o sha1.o blowfish.o md5.o nqueens.o fftbench.o
 
 MODULES = computer.so devices.so benchmark.so network.so
 
-all:	$(OBJECTS) $(MODULES) hardinfo
-
-hardinfo:
+all:	$(OBJECTS) $(MODULES)
 	$(CC) $(CCFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
 		$(SOUP_LIBS)
 
@@ -38,14 +36,12 @@ nqueens.o:
 	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -c nqueens.c -o $@
 
 benchmark.so:	benchmark.c
-	@echo "--- Module: $< ($@)"
 	make $(BENCHMARK_OBJECTS)
 	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \
 		$(GTK_FLAGS) $(GTK_LIBS)
 	ln -sf ../$@ modules
 
 %.so:	%.c
-	@echo "--- Module: $< ($@)"
 	$(CC) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
 	ln -sf ../$@ modules
 	
@@ -68,39 +64,27 @@ deb:	dist-clean
 	dpkg-buildpackage -rfakeroot -k${USER}
 
 install:	all
-	@echo '*** Cleaning up installation...'
 	rm -rf ${DESTDIR}${LIBDIR}/hardinfo/modules ${DESTDIR}/usr/share/hardinfo/pixmaps
 
-	@echo '*** Creating directories...'
 	mkdir -p ${DESTDIR}/usr/bin
 	mkdir -p ${DESTDIR}/usr/local
 	mkdir -p ${DESTDIR}/usr/share/applications
-	
-
 	mkdir -p ${DESTDIR}${LIBDIR}/hardinfo/modules
 	mkdir -p ${DESTDIR}/usr/share/hardinfo/pixmaps
 
-	@echo '*** Installing icon...'
 	cp hardinfo.desktop ${DESTDIR}/usr/share/applications
 
-	@echo '*** Installing executable...'
 	cp hardinfo ${DESTDIR}/usr/bin/hardinfo
 
-	@echo '*** Installing modules...'
-	cp -Lvr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules
+	cp -Lr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules
 
-	@echo '*** Installing pixmaps...'
-	cp -Lvr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
+	cp -Lr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
 
-	@echo '*** Installing misc data...'
 	cp benchmark.conf ${DESTDIR}/usr/share/hardinfo
 	cp benchmark.data ${DESTDIR}/usr/share/hardinfo
 
-	@echo '*** Fixing permissions...'
 	chmod 755 ${DESTDIR}/usr/bin/hardinfo
 
-	@echo '*** Done installing.'
-
 installer:
 	makepackage
 	
-- 
cgit v1.2.3