diff options
| -rw-r--r-- | Makefile | 97 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | binreloc.c | 2 | ||||
| -rw-r--r-- | config.h | 17 | ||||
| -rwxr-xr-x | configure | 2 |
5 files changed, 3 insertions, 117 deletions
diff --git a/Makefile b/Makefile deleted file mode 100644 index c9ff9b05..00000000 --- a/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -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.5.1 -ARCHOPTS = -LIBDIR = /usr/lib - -CCFLAGS = -fPIC -pipe -Wall -g -CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -std=gnu89 -CC = gcc $(ARCHOPTS) -g -CCSLOW = gcc -O0 -g - -# ---------------------------------------------------------------------------- - -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 nqueens.o fftbench.o - -MODULES = computer.so devices.so benchmark.so network.so - -all: $(OBJECTS) $(MODULES) - $(CC) $(CCFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \ - $(SOUP_LIBS) - -md5.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c md5.c -o $@ - -blowfish.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c blowfish.c -o $@ - -sha1.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c sha1.c -o $@ - -fbench.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fbench.c -o $@ - -fftbench.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fftbench.c -o $@ - -nqueens.o: - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c nqueens.c -o $@ - -benchmark.so: benchmark.c - make $(BENCHMARK_OBJECTS) - $(CCSLOW) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \ - $(GTK_FLAGS) $(GTK_LIBS) - ln -sf ../$@ modules - -%.so: %.c - $(CC) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) - ln -sf ../$@ modules - -clean: - rm -rf .xvpics pixmaps/.xvpics *.o *.so hardinfo modules/*.so report - find . -name \*~ -exec rm -v {} \; - find . -name x86 -type l -exec rm -v {} \; - -dist-clean: clean - rm -rf Makefile debian/hardinfo/ config.h arch/this - -package: dist-clean - @echo "Creating tar.gz..." - cd .. && tar czf $(PACKAGE).tar.gz $(PACKAGE)/* && cd $(PACKAGE) - @echo "Creating tar.bz2..." - cd .. && tar cjf $(PACKAGE).tar.bz2 $(PACKAGE)/* && cd $(PACKAGE) - -deb: dist-clean - @echo "Creating deb..." - dpkg-buildpackage -rfakeroot -k${USER} - -install: all - rm -rf ${DESTDIR}${LIBDIR}/hardinfo/modules ${DESTDIR}/usr/share/hardinfo/pixmaps - - 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 - - cp hardinfo.desktop ${DESTDIR}/usr/share/applications - - cp hardinfo ${DESTDIR}/usr/bin/hardinfo - - cp -Lr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules - - cp -Lr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps - - cp benchmark.conf ${DESTDIR}/usr/share/hardinfo - cp benchmark.data ${DESTDIR}/usr/share/hardinfo - - chmod 755 ${DESTDIR}/usr/bin/hardinfo - -installer: - makepackage - diff --git a/Makefile.in b/Makefile.in index 2c69fe94..03a9df8b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ CCFLAGS = -fPIC -pipe -Wall -g -CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -std=gnu89 +CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. CC = gcc $(ARCHOPTS) -g CCSLOW = gcc -O0 -g @@ -594,7 +594,7 @@ gchar *gbr_find_lib_dir(const gchar * default_lib_dir) } #ifdef ARCH_x86_64 - dir = g_build_filename(prefix, "lib", NULL); + dir = g_build_filename(prefix, "lib64", NULL); #else dir = g_build_filename(prefix, "lib", NULL); #endif diff --git a/config.h b/config.h deleted file mode 100644 index 145f55d8..00000000 --- a/config.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __CONFIG_H__ -#define __CONFIG_H__ - -#define VERSION "0.5.1" -#define ARCH_i386 -#define ARCH "ARCH_i386" -#define PLATFORM "Linux" -#define KERNEL "2.6.30-1-686" -#define HOSTNAME "comanche" -#define PREFIX "/usr/share/hardinfo/" -#define LIBPREFIX "/usr/lib/hardinfo/" -#define HAS_LINUX_WE -#define DEBUG(...) -#define ENABLE_BINRELOC 1 -#define RELEASE 1 - -#endif /* __CONFIG_H__ */ @@ -56,7 +56,7 @@ case $PROC in x86_64) ln -sf linux/x86_64 arch/this ARCH="ARCH_x86_64" - LIBDIR="/usr/lib" ;; + LIBDIR="/usr/lib64" ;; mips*) ln -sf linux/mips arch/this ARCH="ARCH_MIPS" ;; |