2 files changed, 13 insertions, 11 deletions

diff --git a/hardinfo2/Makefile.in b/hardinfo2/Makefile.in
index d177784c..c247749c 100644
--- a/hardinfo2/Makefile.in
+++ b/hardinfo2/Makefile.in
@@ -1,18 +1,20 @@
 
 CC = gcc $(ARCHOPTS) -g
 CCSLOW = gcc -O0 -g
-CFLAGS = -fPIC -pipe -Wall -g $(GTK_CFLAGS) $(GLADE_CFLAGS) $(SOUP_CFLAGS) -I.
+CFLAGS = -fPIC -pipe -Wall -g $(GTK_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 \
-		vendor.o socket.o fbench.o syncmanager.o
+OBJECTS = hardinfo.o shell.o util.o iconcache.o loadgraph.o  \
+		menu.o stock.o callbacks.o expr.o report.o binreloc.o \
+		vendor.o socket.o syncmanager.o
+BENCHMARK_OBJECTS = fbench.o sha1.o blowfish.o md5.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) $(SOUP_LIBS) $(SOUP_FLAGS)
+	$(CC) $(CFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
+		$(SOUP_LIBS)
 
 md5.o:
 	$(CCSLOW) $(CFLAGS) -c md5.c -o $@
@@ -28,14 +30,14 @@ fbench.o:
 
 benchmark.so:	benchmark.c
 	@echo "--- Module: $< ($@)"
-	$(CCSLOW) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) \
-		$(GLADE_LIBS) $(GLADE_FLAGS)
+	make $(BENCHMARK_OBJECTS)
+	$(CCSLOW) $(CFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \
+		$(GTK_FLAGS) $(GTK_LIBS)
 	ln -sf ../$@ modules
 
 %.so:	%.c
 	@echo "--- Module: $< ($@)"
-	$(CC) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) \
-		$(GLADE_LIBS) $(GLADE_FLAGS)
+	$(CC) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
 	ln -sf ../$@ modules
 	
 clean:
diff --git a/hardinfo2/util.c b/hardinfo2/util.c
index d8f7522f..28d51635 100644
--- a/hardinfo2/util.c
+++ b/hardinfo2/util.c
@@ -630,7 +630,7 @@ static void module_entry_free(gpointer data, gpointer user_data)
     }
 }
 
-static void module_free(ShellModule * module)
+void module_free(ShellModule * module)
 {
     g_free(module->name);
     g_object_unref(module->icon);