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

so that 'make dist' will work.
2025-08-29 05:17:59 +00:00 · 2006-11-04 21:34:47 +00:00 · 2006-11-04 21:34:47 +00:00 · af33afe8f7
commit af33afe8f7
parent 63e3bea106
15 changed files with 49 additions and 92 deletions
--- a/changehat/libapparmor/Makefile
+++ b/changehat/libapparmor/Makefile
@ -24,12 +24,12 @@ COMMONDIR:=$(strip $(shell if [ -d "../common/" ] ; then \
 	             echo "/common_dir_not_found" ; \
 	     fi))

-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 .
+common/Make.rules: $(COMMONDIR)/Make.rules
+	ln -sf $(COMMONDIR) .
 endif

 SO_VERS		= 1
@ -113,5 +113,5 @@ install: $(SPECFILE) $(TARGETS) $(OLDTARGET)

 .PHONY: clean
 clean:
-	rm -f *.o $(TARGET)*.so* ${TARGETS} ${OLDTARGET}
+	rm -f *.o $(TARGET)*.so* ${TARGETS} ${OLDTARGET} Make.rules
 	rm -f ${NAME}-${VERSION}*.tar.gz ${TESTS} $(NAME)-*.tgz ${SPECFILE}
--- a/changehat/libapparmor/libapparmor.spec.in
+++ b/changehat/libapparmor/libapparmor.spec.in
@ -36,7 +36,7 @@
 Name: libapparmor
 Summary: Library to provide key AppArmor symbols
 Version: @@immunix_version@@
-Release: 6
+Release: @@repo_version@@
 %if %distro == "suse"
 Group: System/Libraries
 %else
--- a/changehat/mod_apparmor/Makefile
+++ b/changehat/mod_apparmor/Makefile
@ -18,12 +18,12 @@ NAME:=apache2-mod_apparmor
 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 .
+common/Make.rules: $(COMMONDIR)/Make.rules
+	ln -sf $(COMMONDIR) .
 endif

 TARGET:=mod_apparmor.so
@ -55,5 +55,5 @@ install: ${TARGET}

 .PHONY: clean
 clean:
-	rm -rf .libs 
-	rm -f ${NAME}*.tar.gz *.la *.lo *.so *.o *.slo
+	rm -rf .libs
+	rm -f ${NAME}*.tar.gz *.la *.lo *.so *.o *.slo Make.rules
--- a/changehat/tomcat_apparmor/tomcat_5_0/Makefile
+++ b/changehat/tomcat_apparmor/tomcat_5_0/Makefile
@ -18,27 +18,24 @@ NAME 		= tomcat_apparmor
 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

 LIB		= lib
 CATALINA_HOME 	= /usr/share/tomcat5

 # By default build 1.4 bytecode
-all: 
+all:
 	ant -Dtarget=1.4 jar jni_so

 clean:
 	ant clean
-	rm -f tomcat_apparmor.spec tomcat_apparmor-*.tar.gz
+	rm -f tomcat_apparmor.spec ${NAME}-*.tar.gz Make.rules

 install: $(SPECFILE)
 	 ant  -Dversion=$(VERSION) -Drelease=$(RELEASE) -Dcatalina_home=${CATALINA_HOME} -Dinstall_lib=${LIB} install_jar install_jni
--- a/common/Make-po.rules
+++ b/common/Make-po.rules
@ -41,5 +41,4 @@ install: ${TARGET_MOS}

 .PHONY: clean
 clean:
-	rm -f *.mo
-
+	rm -f *.mo Make.rules
--- a/management/yastui/Makefile
+++ b/management/yastui/Makefile
@ -16,22 +16,15 @@ all:
 COMMONDIR=../../common/
 THEMEDIR=

-include Make.rules
+include common/Make.rules

 COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
 ifeq ($(COMMONDIR_EXISTS), true)
-Make.rules: $(COMMONDIR)/Make.rules src/locale/Make.rules src/po/Make.rules
-	ln -f $(COMMONDIR)/Make.rules .
-
-src/po/Make.rules: $(COMMONDIR)/Make-po.rules
-	make -C src/po Make.rules
-
-src/locale/Make.rules: $(COMMONDIR)/Make-po.rules
-	make -C src/locale Make.rules
-
+common/Make.rules: $(COMMONDIR)/Make.rules
+	ln -sf $(COMMONDIR) .
 endif

-SUBDIRS		= clients include scrconf desktop agents perl icons bin 
+SUBDIRS		= clients include scrconf desktop agents perl icons bin

 .PHONY:	install
 install:
@ -63,4 +56,4 @@ install:

 .PHONY: clean
 clean:
-	rm -f $(TARBALL) ${NAME}-${VERSION}-*.tar.gz
+	rm -f $(TARBALL) ${NAME}-${VERSION}-*.tar.gz Make.rules
--- a/management/yastui/src/locale/Makefile
+++ b/management/yastui/src/locale/Makefile
@ -14,17 +14,11 @@ all:
 # made/installed.
 LANGS=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 ../../common/Make-po.rules

-include Make.rules
+../../common/Make-po.rules:
+	make -C ../.. common/Make.rules

 # This definition has to come after the inclusion of Make.rules in order
 # to override the definition of LOCALEDIR in it.
 LOCALEDIR=/usr/share/YaST2/locale
-
-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
-
--- a/management/yastui/src/po/Makefile
+++ b/management/yastui/src/po/Makefile
@ -14,17 +14,11 @@ 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 ../../common/Make-po.rules

-include Make.rules
+../../common/Make-po.rules:
+	make -C ../.. common/Make.rules

 # This definition has to come after the inclusion of Make.rules in order
 # to override the definition of LOCALEDIR in it.
 LOCALEDIR=/usr/share/locale
-
-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
-
--- a/parser/Makefile
+++ b/parser/Makefile
@ -18,15 +18,12 @@ NAME=apparmor-parser
 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

 DESTDIR=/
--- a/parser/po/Makefile
+++ b/parser/po/Makefile
@ -14,15 +14,8 @@ all:
 # DISABLED LANGS = ar
 LANGS=bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl he hi hr hu id it ja ka km ko lo lt nb nl pa pl pt_BR pt ro ru sk sl sr sv ta tr uk vi 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=C --keyword=_ $(shell if [ -f ${NAME}.pot ] ; then echo -n -j ; fi)
-
-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
--- a/profiles/Makefile
+++ b/profiles/Makefile
@ -24,12 +24,12 @@ NAME=apparmor-profiles
 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
+common/Make.rules: $(COMMONDIR)/Make.rules
+	ln -sf $(COMMONDIR) .
 endif

 DESTDIR=/
@ -51,7 +51,7 @@ install:

 .PHONY: clean
 clean:
-	-rm -f $(NAME)-$(VERSION)*.tar.gz
+	-rm -f $(NAME)-$(VERSION)*.tar.gz Make.rules

 ifndef VERBOSE
  Q=@
--- a/profiles/apparmor-profiles.spec.in
+++ b/profiles/apparmor-profiles.spec.in
@ -24,7 +24,7 @@
 Summary: AppArmor profiles 
 Name: apparmor-profiles
 Version: @@immunix_version@@
-Release: 12
+Release: @@repo_version@@
 Group: Productivity/Security
 Source0: %{name}-%{version}-@@repo_version@@.tar.gz
 License: GPL
--- a/utils/Makefile
+++ b/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

--- a/utils/apparmor-utils.spec.in
+++ b/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
--- a/utils/po/Makefile
+++ b/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
-