diff options
| author | Leandro Augusto Fogolin Pereira <leandro@zorg.(none)> | 2008-12-29 18:00:44 -0200 |
|---|---|---|
| committer | Leandro Augusto Fogolin Pereira <leandro@zorg.(none)> | 2008-12-29 18:00:44 -0200 |
| commit | 1b2ab315134f2672032fd91b571d811cd5b466b0 (patch) | |
| tree | 3f2b7bef9e7560c3fe397d9d6fd88051f6c40c0d /hardinfo2 | |
| parent | 3fa93d8aac949667d8aca6109b9b1e695caa90de (diff) | |
Compile MD5, SHA1, Blowfish and FBench only on benchmark module; overall Makefile cleanup
Diffstat (limited to 'hardinfo2')
| -rw-r--r-- | hardinfo2/Makefile.in | 22 | ||||
| -rw-r--r-- | hardinfo2/util.c | 2 |
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 "[01;34m--- Module: $< ($@)[00m" - $(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 "[01;34m--- Module: $< ($@)[00m" - $(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); |