Merge commit 'clark/clark' into merge_ipv4

Cleaned up the Makefile to not be as intrusive in regards to
building and installing the rteval_parserd.  This should really
be done in the .spec file and not this main Makefile

Conflicts:
	.gitignore
	Makefile

1 files changed, 36 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 0f9a4fb..4a3f117 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,8 @@ APACHECONF :=	server/apache-rteval.conf.tpl	\
 
 XMLRPCDOC  :=	server/README.xmlrpc
 
+
+XMLPARSERVER := 1.0
 XMLPARSERDIR := server/parser
 
 SQLSRC	   :=	sql/rteval-1.0.sql
@@ -44,6 +46,10 @@ LOADDIR	:=	loadsource
 
 KLOAD	:=	$(LOADDIR)/linux-2.6.26.1.tar.bz2
 HLOAD	:=	$(LOADDIR)/hackbench.tar.bz2
+BLOAD	:=	$(LOADDIR)/dbench-4.0.tar.gz
+LOADS	:=	$(KLOAD) $(HLOAD) $(BLOAD)
+
+.PHONY = rteval_parserd
 
 runit:
 	[ -d ./run ] || mkdir run
@@ -56,17 +62,17 @@ clean:
 	rm -f *~ rteval/*~ rteval/*.py[co] *.tar.bz2 rteval_parserd.tar.gz
 
 realclean: clean
-	make -C $(XMLPARSERDIR)
+	[ -f $(XMLPARSERDIR)/Makefile ] && make -C $(XMLPARSERDIR) maintainer-clean || echo -n
 	rm -rf run tarball rpm
 
-install: rteval_parserd installdirs
+install: install_loads install_rteval
+
+install_rteval: installdirs
 	if [ "$(DESTDIR)" = "" ]; then \
 		python setup.py install; \
 	else \
 		python setup.py install --root=$(DESTDIR); \
 	fi
-	install -m 644 $(KLOAD) $(DATADIR)/rteval/loadsource
-	install -m 644 $(HLOAD) $(DATADIR)/rteval/loadsource
 	install -m 644 rteval/rteval_text.xsl $(DATADIR)/rteval
 	install -m 644 rteval/rteval_dmi.xsl $(DATADIR)/rteval
 	install -m 644 rteval/rteval.conf $(CONFDIR)
@@ -75,14 +81,14 @@ install: rteval_parserd installdirs
 	chmod 755 $(PYLIB)/rteval/rteval.py
 	ln -s $(PYLIB)/rteval/rteval.py $(DESTDIR)/usr/bin/rteval;
 
-	if [ "$(DESTDIR)" = "" ]; then \
-		make -C server/rteval_parserd-* DESTDIR="$(DESTDIR)" install; \
-	else \
-		make -C server/rteval_parserd-* install; \
-	fi
+install_loads:	$(LOADS)
+	[ -d $(DATADIR)/rteval/loadsource ] || mkdir -p $(DATADIR)/rteval/loadsource
+	for l in $(LOADS); do \
+		install -m 644 $$l $(DATADIR)/rteval/loadsource; \
+	done
 
 installdirs:
-	[ -d $(DATADIR)/rteval/loadsource ] || mkdir -p $(DATADIR)/rteval/loadsource
+	[ -d $(DATADIR)/rteval ] || mkdir -p $(DATADIR)/rteval
 	[ -d $(CONFDIR) ] || mkdir -p $(CONFDIR)
 	[ -d $(MANDIR)/man8 ]  || mkdir -p $(MANDIR)/man8
 	[ -d $(PYLIB) ]   || mkdir -p $(PYLIB)
@@ -98,7 +104,7 @@ uninstall:
 tarfile_prep:
 	rm -rf tarball && mkdir -p tarball/rteval-$(VERSION)/rteval tarball/rteval-$(VERSION)/server tarball/rteval-$(VERSION)/sql
 
-tarfile: tarfile_prep rteval_parserd_src
+tarfile: tarfile_prep rteval_parserd-$(XMLPARSERVER).tar.gz
 	cp $(PYSRC) tarball/rteval-$(VERSION)/rteval
 	cp $(XSLSRC) tarball/rteval-$(VERSION)/rteval
 	cp $(CONFSRC) tarball/rteval-$(VERSION)/rteval
@@ -110,23 +116,16 @@ tarfile: tarfile_prep rteval_parserd_src
 	cp $(SQLSRC) tarball/rteval-$(VERSION)/sql
 	tar -C tarball -cjvf rteval-$(VERSION).tar.bz2 rteval-$(VERSION)
 
-rteval_parserd.tar.gz :
+rteval_parserd-$(XMLPARSERVER).tar.gz :
 	cd $(XMLPARSERDIR) ;             \
 	autoreconf --install ;           \
 	./configure --prefix=$(PREFIX) ; \
 	make distcheck
-	cp $(XMLPARSERDIR)/rteval_parserd-*.tar.gz $(HERE)/$@
+	cp $(XMLPARSERDIR)/rteval_parserd-$(XMLPARSERVER).tar.gz $(HERE)/
 
-rteval_parserd_src : rteval_parserd.tar.gz
-	mkdir -p $(HERE)/tarball/rteval-$(VERSION)/server
-	tar -C $(HERE)/tarball/rteval-$(VERSION)/server -xvf $(HERE)/rteval_parserd.tar.gz
+rpms rpm: rtevalrpm loadrpm
 
-rteval_parserd :
-	cd server/rteval_parserd-* ; \
-	./configure --prefix=$(PREFIX) ;                                      \
-	make
-
-rpm:	tarfile
+rtevalrpm: tarfile
 	rm -rf rpm
 	mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS}
 	cp rteval-$(VERSION).tar.bz2 rpm/SOURCES
@@ -134,6 +133,21 @@ rpm:	tarfile
 	cp loadsource/* rpm/SOURCES
 	rpmbuild -ba --define "_topdir $(HERE)/rpm" rpm/SPECS/rteval.spec
 
+loadrpm: 
+	rm -rf rpm-loads
+	mkdir -p rpm-loads/{BUILD,RPMS,SRPMS,SOURCES,SPECS}
+	cp rteval-loads.spec rpm-loads/SPECS
+	cp $(LOADS) rpm-loads/SOURCES
+	rpmbuild -ba --define "_topdir $(HERE)/rpm-loads" rpm-loads/SPECS/rteval-loads.spec
+
+rpmlint: rpms
+	@echo "==============="
+	@echo "running rpmlint"
+	rpmlint -v rpm/SRPMS/rteval*.src.rpm
+	rpmlint -v rpm/RPMS/noarch/rteval*.noarch.rpm
+	rpmlint -v rpm-loads/SRPMS/rteval-loads*.src.rpm
+	rpmlint -v rpm-loads/RPMS/noarch/rteval-loads*.noarch.rpm
+
 help:
 	@echo ""
 	@echo "rteval Makefile targets:"