1 files changed, 6 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index d929653c..3a9e6f32 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-GTK_LIBS = -lpthread -lgthread-2.0 -lrt -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
-GTK_CFLAGS = -D_REENTRANT -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/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12  
+GTK_LIBS = -lpthread -lgthread-2.0 -lrt -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
+GTK_CFLAGS = -D_REENTRANT -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/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
 SOUP_LIBS = 
 SOUP_CFLAGS = 
-PACKAGE = hardinfo-0.5c
+PACKAGE = hardinfo-0.5.1
 ARCHOPTS = 
 LIBDIR = /usr/lib
 
@@ -20,9 +20,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)
 
@@ -45,14 +43,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
 	
@@ -75,39 +71,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