1 files changed, 19 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index 032b2629..6acd957a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,17 +1,18 @@
 
 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 $@
@@ -22,11 +23,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
@@ -61,19 +71,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