Convert the rest of the packages to symlinking in the common directory

so that 'make dist' will work.

utils/Makefile

@@ -18,15 +18,12 @@ NAME 		= apparmor-utils
 all:
 COMMONDIR=../common/
 
-include Make.rules
+include common/Make.rules
 
 COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
 ifeq ($(COMMONDIR_EXISTS), true)
-Make.rules: $(COMMONDIR)/Make.rules 
-	ln -f $(COMMONDIR)/Make.rules .
-
-po/Make.rules: $(COMMONDIR)/Make-po.rules
-	make -C po Make.rules
+common/Make.rules: $(COMMONDIR)/Make.rules
+	ln -sf $(COMMONDIR) .
 endif
 
 TOOLS = genprof logprof autodep audit complain enforce \
@@ -42,7 +39,7 @@ po/${NAME}.pot: ${TOOLS}
 	make -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS} SubDomain.pm Reports.pm"
 
 .PHONY: install
-install: 
+install:
 	install -d ${CONFDIR}
 	install -m 644 logprof.conf severity.db ${CONFDIR}
 	install -d ${BINDIR}
@@ -61,8 +58,8 @@ install:
 	mkdir -m 0700 -p $(DESTDIR)/var/log/apparmor
 	
 .PHONY: clean
-clean: po/Make.rules
-	rm -f core core.* *.o *.s *.a *~ 
-	rm -f $(NAME)-$(VERSION)-*.tar.gz
+clean:
+	rm -f core core.* *.o *.s *.a *~
+	rm -f $(NAME)-$(VERSION)-*.tar.gz Make.rules
 	make -C po clean
 

utils/apparmor-utils.spec.in

@@ -25,7 +25,7 @@
 Summary: AppArmor userlevel utilities that are useful in creating AppArmor profiles.
 Name: apparmor-utils
 Version: @@immunix_version@@
-Release: 7
+Release: @@repo_version@@
 Group: Productivity/Security
 Source0: %{name}-%{version}-@@repo_version@@.tar.gz
 License: GPL

utils/po/Makefile

@@ -20,15 +20,8 @@ all:
 # made/installed.
 LANGS=en_US de_DE es_ES fr_FR hu_HU it_IT ja_JP nb_NO pt_BR pt_PT zh_CN zh_TW
 
-COMMONDIR=../../common/
-
-include Make.rules
+include ../common/Make-po.rules
+../common/Make-po.rules:
+	make -C .. common/Make.rules
 
 XGETTEXT_ARGS+=--language=perl
-
-COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
-ifeq ($(COMMONDIR_EXISTS), true)
-Make.rules: $(COMMONDIR)/Make-po.rules
-	ln -f $(COMMONDIR)/Make-po.rules $@
-endif
-