X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FMakefile;h=c3e5aeffe0b05a88d547955a1968c602cda8cc64;hp=16806ee86ca8c30a4bdacb4cff2569186abf6459;hb=8f1192842a00af8626df1dfbb6a76c1f4944ac9b;hpb=ba0b3a0a1eae4d40ea2cdeeea33b47ad150f4ad1;ds=sidebyside

diff --git a/src/Makefile b/src/Makefile
index 16806ee..c3e5aef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,11 @@
 
-PREFIX=/usr
-BINDIR=${PREFIX}/bin
-SBINDIR=${PREFIX}/sbin
-MANDIR=${PREFIX}/share/man
-DOCDIR=${PREFIX}/share/doc
-MAN1DIR=${MANDIR}/man1/
-PERLDIR=${PREFIX}/share/perl5
-
-LIB_SOURCES=			\
-	Firewall.pm
+export PREFIX=/usr
+export BINDIR=${PREFIX}/bin
+export SBINDIR=${PREFIX}/sbin
+export MANDIR=${PREFIX}/share/man
+export DOCDIR=${PREFIX}/share/doc
+export MAN1DIR=${MANDIR}/man1/
+export PERLDIR=${PREFIX}/share/perl5
 
 all: pvefw-logger
 
@@ -17,22 +14,21 @@ CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 pvefw-logger: pvefw-logger.c
-	gcc -Wall -Werror pvefw-logger.c -o pvefw-logger -std=gnu99 \
+	gcc -Wall -Werror pvefw-logger.c -o pvefw-logger -std=gnu11 \
 	$(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
 	$(shell pkg-config libnetfilter_log glib-2.0 gthread-2.0 --libs --cflags)
 
 .PHONY: install
 install: pvefw pvefw-logger
+	make -C PVE install
 	install -d -m 0755 ${DESTDIR}/${SBINDIR}
 	install -m 0755 pvefw ${DESTDIR}/${SBINDIR}
 	install -m 0755 --strip pvefw-logger ${DESTDIR}/${SBINDIR}
-	install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE
-	for i in ${LIB_SOURCES}; do install -D -m 0644 PVE/$$i ${DESTDIR}${PERLDIR}/PVE/$$i; done
-
 
 .PHONY: clean
 clean: 	
-	rm -rf *~
+	make -C PVE clean
+	rm -rf *~ pvefw-logger
 
 .PHONY: distclean
 distclean: clean