diff options
| -rw-r--r-- | hardinfo2/Makefile.in | 24 | ||||
| -rw-r--r-- | hardinfo2/autopackage/default.apspec | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/hardinfo2/Makefile.in b/hardinfo2/Makefile.in index 89f3d5b6..b970ffc8 100644 --- a/hardinfo2/Makefile.in +++ b/hardinfo2/Makefile.in @@ -1,8 +1,8 @@ CCFLAGS = -fPIC -pipe -Wall -g CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -CC = gcc $(ARCHOPTS) -g -CCSLOW = gcc -O0 -g +CCC = $(CC) $(ARCHOPTS) -g +CCCSLOW = $(CC) -O0 -g # ---------------------------------------------------------------------------- @@ -16,34 +16,34 @@ MODULES = computer.so devices.so benchmark.so network.so all: $(OBJECTS) $(MODULES) hardinfo hardinfo: - $(CC) $(CCFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \ + $(CCC) $(CCFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \ $(SOUP_LIBS) md5.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c md5.c -o $@ + $(CCCSLOW) $(CCFLAGS) $(CFLAGS) -c md5.c -o $@ blowfish.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c blowfish.c -o $@ + $(CCCSLOW) $(CCFLAGS) $(CFLAGS) -c blowfish.c -o $@ sha1.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c sha1.c -o $@ + $(CCCSLOW) $(CCFLAGS) $(CFLAGS) -c sha1.c -o $@ fbench.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fbench.c -o $@ + $(CCCSLOW) $(CCFLAGS) $(CFLAGS) -c fbench.c -o $@ nqueens.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c nqueens.c -o $@ + $(CCCSLOW) $(CCFLAGS) $(CFLAGS) -c nqueens.c -o $@ benchmark.so: benchmark.c @echo "[01;34m--- Module: $< ($@)[00m" make $(BENCHMARK_OBJECTS) - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \ + $(CCCSLOW) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \ $(GTK_FLAGS) $(GTK_LIBS) ln -sf ../$@ modules %.so: %.c @echo "[01;34m--- Module: $< ($@)[00m" - $(CC) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) + $(CCC) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) ln -sf ../$@ modules clean: @@ -84,10 +84,10 @@ install: all cp hardinfo ${DESTDIR}/usr/bin/hardinfo @echo '[01;34m*** Installing modules...[00m' - cp -Lr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules + cp -Lvr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules @echo '[01;34m*** Installing pixmaps...[00m' - cp -Lr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps + cp -Lvr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps @echo '[01;34m*** Installing misc data...[00m' cp benchmark.conf ${DESTDIR}/usr/share/hardinfo diff --git a/hardinfo2/autopackage/default.apspec b/hardinfo2/autopackage/default.apspec index fbe908eb..a1c0bbbe 100644 --- a/hardinfo2/autopackage/default.apspec +++ b/hardinfo2/autopackage/default.apspec @@ -2,7 +2,7 @@ # Generated by mkapspec 0.2 [Meta] ShortName: hardinfo -SoftwareVersion: 0.4.3-beta +SoftwareVersion: 0.4.3-beta2 DisplayName: HardInfo $SOFTWAREVERSION RootName: @tia.mat.br/hardinfo:$SOFTWAREVERSION Summary: System profiler and benchmark tool @@ -20,6 +20,7 @@ License: GPL # need to pass arguments to configure, just add them to prepareBuild: # prepareBuild --enable-foo --disable-bar export APBUILD_INCLUDE="/usr/local/gtk-headers/2.6" +export CC="apgcc" prepareBuild [BuildUnprepare] @@ -47,6 +48,7 @@ installData share/* copyFile lib/hardinfo/modules/benchmark.so $PREFIX/lib/hardinfo/modules/benchmark.so copyFile lib/hardinfo/modules/computer.so $PREFIX/lib/hardinfo/modules/computer.so copyFile lib/hardinfo/modules/devices.so $PREFIX/lib/hardinfo/modules/devices.so +copyFile lib/hardinfo/modules/network.so $PREFIX/lib/hardinfo/modules/network.so installMenuItem "System" share/applications/hardinfo.desktop [Uninstall] |