removed automake/autoconf, removed unused files

Makefile.am → Makefile

-AUTOMAKE_OPTIONS = foreign
+include defines.mk
 
-include $(top_builddir)/common.mk
+DESTDIR=
 
-SUBDIRS = bin lib www aplinfo po
+#SUBDIRS = bin lib www aplinfo
+SUBDIRS = aplinfo PVE bin www
 
 DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_all.deb
-CDATE:=$(shell date +%F)
-SNAP=${PACKAGE}-${VERSION}-${CDATE}.tar.gz
 
-vzconf_SCRIPTS = vznet.conf
-vzconfdir = /etc/vz
+all: ${SUBDIRS}
+
+%:
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+
 
 .PHONY: dinstall
 dinstall: ${DEB}
@@ -20,14 +22,12 @@ country.dat: country.pl
 
 .PHONY: ${DEB}
 ${DEB} deb:
-	./autogen.sh
-	./configure
 	make clean
 	rm -rf dest
 	mkdir dest
-	make DESTDIR=`pwd`/dest install-strip
+	make DESTDIR=`pwd`/dest install
 	mkdir dest/DEBIAN
-	install -m 0644 debian/control dest/DEBIAN
+	sed -e s/@VERSION@/${VERSION}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@PACKAGERELEASE@/${PACKAGERELEASE}/ debian/control.in >dest/DEBIAN/control
 	install -m 0644 debian/conffiles dest/DEBIAN
 	install -m 0755 debian/config dest/DEBIAN
 	install -m 0644 debian/templates dest/DEBIAN
@@ -52,41 +52,39 @@ upload: ${DEB}
 	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
 	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
 
-.PHONY: poupload
-poupload:
-	rsync po/*.po po/pve-manager.pot pve.proxmox.com:/home/ftp/sources/po-files/
-
-.PHONY: aplupload
-aplupload:
-	./aplinfo/apltest.pl
-	gpg -bas -u support@proxmox.com aplinfo/aplinfo.dat
-	gzip -c aplinfo/aplinfo.dat > aplinfo.dat.gz
-	scp aplinfo/aplinfo.dat aplinfo.dat.gz aplinfo/aplinfo.dat.asc pve.proxmox.com:/home/ftp/appliances/
-
-install-data-local: country.dat
-	mkdir -p ${DESTDIR}/usr/share/${PACKAGE}
-	mkdir -p ${DESTDIR}/usr/share/doc/${PACKAGE}
-	mkdir -p ${DESTDIR}/var/lib/${PACKAGE}
-	mkdir -p ${DESTDIR}/var/lib/vz/images
-	mkdir -p ${DESTDIR}/var/lib/vz/template/cache
-	mkdir -p ${DESTDIR}/var/lib/vz/template/iso
-	mkdir -p ${DESTDIR}/var/lib/vz/template/qemu
+#.PHONY: poupload
+#poupload:
+#	rsync po/*.po po/pve-manager.pot pve.proxmox.com:/home/ftp/sources/po-files/
+
+#.PHONY: aplupload
+#aplupload:
+#	./aplinfo/apltest.pl
+#	gpg -bas -u support@proxmox.com aplinfo/aplinfo.dat
+#	gzip -c aplinfo/aplinfo.dat > aplinfo.dat.gz
+#	scp aplinfo/aplinfo.dat aplinfo.dat.gz aplinfo/aplinfo.dat.asc pve.proxmox.com:/home/ftp/appliances/
+
+.PHONY: install
+install: country.dat vznet.conf
+	install -d ${DESTDIR}/usr/share/${PACKAGE}
+	install -d ${DESTDIR}/usr/share/man/man1
+	install -d ${DESTDIR}/usr/share/doc/${PACKAGE}
+	install -d ${DESTDIR}/var/lib/${PACKAGE}
+	install -d ${DESTDIR}/var/lib/vz/images
+	install -d ${DESTDIR}/var/lib/vz/template/cache
+	install -d ${DESTDIR}/var/lib/vz/template/iso
+	install -d ${DESTDIR}/var/lib/vz/template/qemu
+	install -D -m 0755 vznet.conf ${DESTDIR}/etc/vz/vznet.conf
 	install -m 0644 copyright ${DESTDIR}/usr/share/doc/${PACKAGE}
 	install -m 0644 debian/changelog.Debian ${DESTDIR}/usr/share/doc/${PACKAGE}
 	install -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE}
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
+.PHONY: distclean
+distclean: clean
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
-CLEANFILES=*~ *.deb debian/*~ dest ${PACKAGE}-*.tar.gz ${SNAP} country.dat
-
-.PHONY: snap
-${SNAP} snap: clean
-	rm -f ../${SNAP}
-	cd ..; tar cvzf ${SNAP} --exclude .svn --exclude autom4te.cache ${PACKAGE} 
-	mv ../${SNAP} ${SNAP}
-
-.PHONY: uploadsnap  
-uploadsnap: ${SNAP}
-	scp ${SNAP} pve.proxmox.com:/home/ftp/sources/
-
-#ACLOCAL_AMFLAGS = -I m4
-#EXTRA_DIST = config.rpath m4/ChangeLog
+.PHONY: clean
+clean:
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+	find . -name '*~' -exec rm {} ';'
+	rm -rf dest country.dat *.deb

PVE/API2/Makefile

+include ../../defines.mk
+
+PERLSOURCE = 			\
+	Cluster.pm		\
+	Nodes.pm		\
+	Tasks.pm		\
+	Network.pm		\
+	Services.pm
+
+all:
+
+.PHONY: distclean
+distclean: clean
+
+.PHONY: clean
+clean:
+	rm -rf *~
+
+.PHONY: install 
+install: ${PERLSOURCE}
+	install -d ${PERLLIBDIR}/PVE/API2
+	install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2

PVE/Makefile

+include ../defines.mk
+
+SUBDIRS=API2
+
+PERLSOURCE = 			\
+	API2.pm			\
+	API2Client.pm		\
+	APIDaemon.pm		\
+	REST.pm			\
+	APLInfo.pm
+
+all: pvecfg.pm ${SUBDIRS}
+
+pvecfg.pm: pvecfg.pm.in
+	sed -e s/@VERSION@/${VERSION}/ -e s/@PACKAGE@/${PACKAGE}/ $< >$@
+
+%:
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+
+.PHONY: distclean
+distclean: clean
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+
+.PHONY: clean
+clean:
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+	rm -rf *~ pvecfg.pm
+
+.PHONY: install 
+install: pvecfg.pm ${PERLSOURCE}
+	install -d ${PERLLIBDIR}/PVE
+	install -m 0644 pvecfg.pm ${PERLLIBDIR}/PVE/
+	install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done

aplinfo/Makefile

+
+DOCDIR=/usr/share/doc/pve-manager/
+
+all:
+
+.PHONY: install
+install: aplinfo.dat support@proxmox.com.pubkey
+	install -D -m 0644 aplinfo.dat ${DESTDIR}${DOCDIR}/aplinfo.dat
+	install -D -m 0644 support@proxmox.com.pubkey ${DESTDIR}${DOCDIR}/support@proxmox.com.pubkey
+
+.PHONY: distclean
+distclean: clean
+
+.PHONY: clean
+clean:
+	rm -rf *~ aplinfo.dat.gz aplinfo.dat.asc

aplinfo/Makefile.am

-include $(top_builddir)/common.mk
-
-aplinfo_DATA = aplinfo.dat support@proxmox.com.pubkey
-
-CLEANFILES = *~ aplinfo.dat.gz aplinfo.dat.asc
-
-aplinfodir = /usr/share/doc/pve-manager

autogen.sh

-#!/bin/sh
-
-# Refresh GNU autotools toolchain.
-for i in config.guess config.sub missing install-sh mkinstalldirs ; do
-	test -r /usr/share/automake-1.9/${i} && {
-		rm -f ${i}
-		cp /usr/share/automake-1.9/${i} .
-	}
-	chmod 755 ${i}
-done
-
-aclocal
-#aclocal -I m4
-#aclocal -I cmulocal
-#autoheader
-automake --foreign --add-missing
-autoconf
-
-exit 0

bin/Makefile

+include ../defines.mk
+
+SUBDIRS = init.d cron test
+
+SCRIPTS =  			\
+	pvestatd		\
+	pvesh			\
+	pveam			\
+	pvebanner		\
+	pvectl			\
+	pvedaemon		\
+	pveversion		\
+	pveperf
+
+MANS = 				\
+	pvestatd.1		\
+	pvedaemon.1		\
+	pveversion.1		\
+	pveperf.1
+
+%.1: %
+	pod2man -n $* -s 1 -r "proxmox ${VERSION}" -c "Proxmox Documentation" <$* >$*.1
+
+.PHONY: install 
+install: ${SCRIPTS} ${MANS}
+	perl -I.. ./pvesh verifyapi
+	install -d ${BINDIR}
+	install -m 0755 ${SCRIPTS} ${BINDIR}
+	install -d ${MAN1DIR}
+	install -m 0644 ${MANS} ${MAN1DIR}
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+
+.PHONY: distclean
+distclean: clean
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+
+.PHONY: clean
+clean:
+	rm -rf *~ ${MANS}
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done

bin/Makefile.am

-include $(top_builddir)/common.mk
-
-SUBDIRS = init.d cron test
-
-bin_SCRIPTS =  			\
-	pvestatd		\
-	pvesh			\
-	pveam			\
-	pvebanner		\
-	pvectl			\
-	pvedaemon		\
-	pveversion		\
-	pveperf
-
-man_MANS = 			\
-	pvestatd.1		\
-	pvedaemon.1		\
-	pveversion.1		\
-	pveperf.1
-
-CLEANFILES = $(man_MANS) *~
-
-bindir = /usr/bin
-
-install-exec-hook:
-	perl -I$(top_builddir)/lib ./pvesh verifyapi

bin/cron/Makefile

+SUBDIRS = daily
+
+all: ${SUBDIRS}
+
+%:
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done

bin/cron/Makefile.am

-SUBDIRS = daily
\ No newline at end of file

bin/cron/daily/Makefile

+include ../../../defines.mk
+
+all:
+
+.PHONY: install 
+install: pve
+	install -d ${CRONDAILYDIR}
+	install -m 0755 pve ${CRONDAILYDIR}
+
+.PHONY: distclean
+distclean: clean
+
+.PHONY: clean
+clean:
+	rm -rf *~

bin/cron/daily/Makefile.am

-include $(top_builddir)/common.mk
-
-crondaily_SCRIPTS = pve
-crondailydir = /etc/cron.daily
-
-CLEANFILES = *~

bin/init.d/Makefile

+include ../../defines.mk
+
+all:
+
+SCRIPTS = 		\
+	pvedaemon 	\
+	pvebanner	\
+	pvestatd	\
+	pvenetcommit
+
+.PHONY: install 
+install: ${SCRIPTS}
+	install -d ${INITDBINDIR}
+	install -m 0755 ${SCRIPTS} ${INITDBINDIR}
+
+.PHONY: distclean
+distclean: clean
+
+.PHONY: clean
+clean:
+	rm -rf *~

bin/init.d/Makefile.am

-include $(top_builddir)/common.mk
-
-initdbin_SCRIPTS = 	\
-	pvedaemon 	\
-	pvebanner	\
-	pvestatd	\
-	pvenetcommit
-
-initdbindir = /etc/init.d/
-
-CLEANFILES=*~
\ No newline at end of file

bin/test/Makefile

+include ../../defines.mk
+
+all:
+
+SCRIPTS = 		\
+	example1.pl	\
+	example2.pl
+
+.PHONY: install 
+install: ${SCRIPTS}
+	install -d ${DOCDIR}/examples
+	install -m 0755 ${SCRIPTS} ${DOCDIR}/examples
+
+.PHONY: distclean
+distclean: clean
+
+.PHONY: clean
+clean:
+	rm -rf *~

bin/test/Makefile.am

-include $(top_builddir)/common.mk
-
-exampledir = ${DOCDIR}/examples
-
-example_SCRIPTS = 			\
-	example1.pl			\
-	example2.pl
-
-
-CLEANFILES = *~

common.mk

-RELEASE=2.0
-
-man1dir = "/usr/share/man/man1"
-man7dir = "/usr/share/man/man7"
-
-
-%.1: %
-	pod2man -n $* -s 1 -r "proxmox 1.0" -c "Proxmox Documentation" <$* >$*.1

country.pl

 #!/usr/bin/perl -w
 
-use lib qw (./lib);
 use strict;
 use PVE::Tools;
 

defines.mk

+RELEASE=2.0
+
+VERSION=2.0
+PACKAGE=pve-manager
+PKGREL=4
+
+BINDIR=${DESTDIR}/usr/bin
+PERLLIBDIR=${DESTDIR}/usr/share/perl5
+MAN1DIR=${DESTDIR}/usr/share/man/man1
+CRONDAILYDIR=${DESTDIR}/etc/cron.daily
+INITDBINDIR=${DESTDIR}/etc/init.d/
+DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
+WWWBASEDIR=${DESTDIR}/usr/share/${PACKAGE}
+WWWROOTDIR=${WWWBASEDIR}/root
+WWWIMAGEDIR=${WWWBASEDIR}/images
+WWWEXT4DIR=${WWWBASEDIR}/ext4
+WWWCSSDIR=${WWWBASEDIR}/css
\ No newline at end of file

lib/Makefile.am

-include $(top_builddir)/common.mk
-
-SUBDIRS = PVE

lib/PVE.old/SourceFilter.pm

-package PVE::SourceFilter;
-
-use Filter::Util::Call;
-use Data::Dumper;
-
-$Data::Dumper::Indent = 0; 
-
-sub import
-{
-    my($type, @arguments) = @_;
-
-    my $stat = {};
-    filter_add ($stat) ;
-}
-
-sub filter
-{
-    my($self) = @_ ;
-    my($status) ;
-
-    $status = filter_read();
-    if ($status <= 0) {
-	return $status;
-    }
-
-    if (m/^package\s+(\S+);/) {
-	foreach my $k (keys %$self) {delete $self->{$k}; }
-	$self->{packagename} = $1;
-    }
-
-    if (m/^\s*\#\#FILTER_DATA\#\#/) {
-	my $dtxt = Data::Dumper->Dump ([{%$self}], [qw(stats)]);
-	$_ = "sub filter_data { my $dtxt; die \"PVE::SourceFilter - internal error\" if \$stats->{packagename} ne __PACKAGE__; return \$stats; }\n";
-    }
-
-    if (m/^sub\s+(\w+)\s.*\#\#SOAP_EXPORT\#\#/) {
-	$self->{soap_exports}->{$1} = 1;
-    }
-
-    $self->{lines}++;
-
-    $status ;
-}
-
-1;

po/Makefile.in.in

-/usr/share/gettext/po/Makefile.in.in
\ No newline at end of file

po/Rules-quot

-/usr/share/gettext/po/Rules-quot
\ No newline at end of file