aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile66
1 files changed, 42 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index c56693d7..d929653c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,59 @@
-GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
-GTK_CFLAGS = -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/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pixman-1
-SOUP_LIBS = -lsoup-2.2 -lgnutls -ltasn1 -lgcrypt -lgobject-2.0 -lxml2 -lz -lm -lglib-2.0
-SOUP_CFLAGS = -I/usr/include/libsoup-2.2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
-PACKAGE = hardinfo-0.4.2.3
+GTK_LIBS = -lpthread -lgthread-2.0 -lrt -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -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/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12
+SOUP_LIBS =
+SOUP_CFLAGS =
+PACKAGE = hardinfo-0.5c
ARCHOPTS =
LIBDIR = /usr/lib
+CCFLAGS = -fPIC -pipe -Wall -g
+CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
CC = gcc $(ARCHOPTS) -g
CCSLOW = gcc -O0 -g
-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 \
- vendor.o socket.o fbench.o syncmanager.o
-MODULES = computer.so devices.so benchmark.so
+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
-all: $(OBJECTS) $(MODULES)
- $(CC) $(CFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) $(GTK_FLAGS) \
- $(GLADE_LIBS) $(GLADE_FLAGS) $(SOUP_LIBS) $(SOUP_FLAGS)
+MODULES = computer.so devices.so benchmark.so network.so
+
+all: $(OBJECTS) $(MODULES) hardinfo
+
+hardinfo:
+ $(CC) $(CCFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
+ $(SOUP_LIBS)
md5.o:
- $(CCSLOW) $(CFLAGS) -c md5.c -o $@
+ $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c md5.c -o $@
blowfish.o:
- $(CCSLOW) $(CFLAGS) -c blowfish.c -o $@
+ $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c blowfish.c -o $@
sha1.o:
- $(CCSLOW) $(CFLAGS) -c sha1.c -o $@
+ $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c sha1.c -o $@
fbench.o:
- $(CCSLOW) $(CFLAGS) -c fbench.c -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
@echo "--- Module: $< ($@)"
- $(CCSLOW) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) \
- $(GLADE_LIBS) $(GLADE_FLAGS)
+ make $(BENCHMARK_OBJECTS)
+ $(CCSLOW) $(CCFLAGS) $(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) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
ln -sf ../$@ modules
clean:
@@ -64,9 +75,15 @@ deb: dist-clean
dpkg-buildpackage -rfakeroot -k${USER}
install: all
+ @echo '*** Cleaning up installation...'
+ rm -rf ${DESTDIR}${LIBDIR}/hardinfo/modules ${DESTDIR}/usr/share/hardinfo/pixmaps
+
@echo '*** Creating directories...'
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
@@ -77,10 +94,10 @@ install: all
cp hardinfo ${DESTDIR}/usr/bin/hardinfo
@echo '*** Installing modules...'
- cp -Lr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules
+ cp -Lvr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules
@echo '*** Installing pixmaps...'
- cp -Lr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
+ cp -Lvr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
@echo '*** Installing misc data...'
cp benchmark.conf ${DESTDIR}/usr/share/hardinfo
@@ -92,4 +109,5 @@ install: all
@echo '*** Done installing.'
installer:
- makeinstaller
+ makepackage
+