mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-29 13:28:19 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
so that 'make dist' will work.
This commit is contained in:
Steve Beattie 2006-11-04 21:34:47 +00:00
parent 63e3bea106
commit af33afe8f7
15 changed files with 49 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changehat/libapparmor/Makefile
View File

@ -24,12 +24,12 @@ COMMONDIR:=$(strip $(shell if [ -d "../common/" ] ; then \
echo "/common_dir_not_found" ; \ echo "/common_dir_not_found" ; \
fi)) fi))
include Make.rules include common/Make.rules
COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true)) COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
ifeq ($(COMMONDIR_EXISTS), true) ifeq ($(COMMONDIR_EXISTS), true)
Make.rules: $(COMMONDIR)/Make.rules common/Make.rules: $(COMMONDIR)/Make.rules
ln -f $(COMMONDIR)/Make.rules . ln -sf $(COMMONDIR) .
endif endif
SO_VERS = 1 SO_VERS = 1
@ -113,5 +113,5 @@ install: $(SPECFILE) $(TARGETS) $(OLDTARGET)
.PHONY: clean .PHONY: clean
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} rm -f ${NAME}-${VERSION}*.tar.gz ${TESTS} $(NAME)-*.tgz ${SPECFILE}

2
changehat/libapparmor/libapparmor.spec.in
View File

@ -36,7 +36,7 @@
Name: libapparmor Name: libapparmor
Summary: Library to provide key AppArmor symbols Summary: Library to provide key AppArmor symbols
Version: @@immunix_version@@ Version: @@immunix_version@@
Release: 6 Release: @@repo_version@@
%if %distro == "suse" %if %distro == "suse"
Group: System/Libraries Group: System/Libraries
%else %else

10
changehat/mod_apparmor/Makefile
View File

@ -18,12 +18,12 @@ NAME:=apache2-mod_apparmor
all: all:
COMMONDIR=../../common/ COMMONDIR=../../common/
include Make.rules include common/Make.rules
COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true)) COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
ifeq ($(COMMONDIR_EXISTS), true) ifeq ($(COMMONDIR_EXISTS), true)
Make.rules: $(COMMONDIR)/Make.rules common/Make.rules: $(COMMONDIR)/Make.rules
ln -f $(COMMONDIR)/Make.rules . ln -sf $(COMMONDIR) .
endif endif
TARGET:=mod_apparmor.so TARGET:=mod_apparmor.so
@ -55,5 +55,5 @@ install: ${TARGET}
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf .libs rm -rf .libs
rm -f ${NAME}*.tar.gz *.la *.lo *.so *.o *.slo rm -f ${NAME}*.tar.gz *.la *.lo *.so *.o *.slo Make.rules

13
changehat/tomcat_apparmor/tomcat_5_0/Makefile
View File

@ -18,27 +18,24 @@ NAME = tomcat_apparmor
all: all:
COMMONDIR=../../../common/ COMMONDIR=../../../common/
include Make.rules include common/Make.rules
COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true)) COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
ifeq ($(COMMONDIR_EXISTS), true) ifeq ($(COMMONDIR_EXISTS), true)
Make.rules: $(COMMONDIR)/Make.rules common/Make.rules: $(COMMONDIR)/Make.rules
ln -f $(COMMONDIR)/Make.rules . ln -sf $(COMMONDIR) .
po/Make.rules: $(COMMONDIR)/Make-po.rules
make -C po Make.rules
endif endif
LIB = lib LIB = lib
CATALINA_HOME = /usr/share/tomcat5 CATALINA_HOME = /usr/share/tomcat5
# By default build 1.4 bytecode # By default build 1.4 bytecode
all: all:
ant -Dtarget=1.4 jar jni_so ant -Dtarget=1.4 jar jni_so
clean: clean:
ant clean ant clean
rm -f tomcat_apparmor.spec tomcat_apparmor-*.tar.gz rm -f tomcat_apparmor.spec ${NAME}-*.tar.gz Make.rules
install: $(SPECFILE) install: $(SPECFILE)
ant -Dversion=$(VERSION) -Drelease=$(RELEASE) -Dcatalina_home=${CATALINA_HOME} -Dinstall_lib=${LIB} install_jar install_jni ant -Dversion=$(VERSION) -Drelease=$(RELEASE) -Dcatalina_home=${CATALINA_HOME} -Dinstall_lib=${LIB} install_jar install_jni

3
common/Make-po.rules
View File

@ -41,5 +41,4 @@ install: ${TARGET_MOS}
.PHONY: clean .PHONY: clean
clean: clean:
rm -f *.mo rm -f *.mo Make.rules

17
management/yastui/Makefile
View File

@ -16,22 +16,15 @@ all:
COMMONDIR=../../common/ COMMONDIR=../../common/
THEMEDIR= THEMEDIR=
include Make.rules include common/Make.rules
COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true)) COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
ifeq ($(COMMONDIR_EXISTS), true) ifeq ($(COMMONDIR_EXISTS), true)
Make.rules: $(COMMONDIR)/Make.rules src/locale/Make.rules src/po/Make.rules common/Make.rules: $(COMMONDIR)/Make.rules
ln -f $(COMMONDIR)/Make.rules . ln -sf $(COMMONDIR) .
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
endif endif
SUBDIRS = clients include scrconf desktop agents perl icons bin SUBDIRS = clients include scrconf desktop agents perl icons bin
.PHONY: install .PHONY: install
install: install:
@ -63,4 +56,4 @@ install:
.PHONY: clean .PHONY: clean
clean: clean:
rm -f $(TARBALL) ${NAME}-${VERSION}-*.tar.gz rm -f $(TARBALL) ${NAME}-${VERSION}-*.tar.gz Make.rules

12
management/yastui/src/locale/Makefile
View File

@ -14,17 +14,11 @@ all:
# made/installed. # 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 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 # This definition has to come after the inclusion of Make.rules in order
# to override the definition of LOCALEDIR in it. # to override the definition of LOCALEDIR in it.
LOCALEDIR=/usr/share/YaST2/locale 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

12
management/yastui/src/po/Makefile
View File

@ -14,17 +14,11 @@ all:
# made/installed. # 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 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 # This definition has to come after the inclusion of Make.rules in order
# to override the definition of LOCALEDIR in it. # to override the definition of LOCALEDIR in it.
LOCALEDIR=/usr/share/locale 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

9
parser/Makefile
View File

@ -18,15 +18,12 @@ NAME=apparmor-parser
all: all:
COMMONDIR=../common/ COMMONDIR=../common/
include Make.rules include common/Make.rules
COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true)) COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
ifeq ($(COMMONDIR_EXISTS), true) ifeq ($(COMMONDIR_EXISTS), true)
Make.rules: $(COMMONDIR)/Make.rules common/Make.rules: $(COMMONDIR)/Make.rules
ln -f $(COMMONDIR)/Make.rules . ln -sf $(COMMONDIR) .
po/Make.rules: $(COMMONDIR)/Make-po.rules
make -C po Make.rules
endif endif
DESTDIR=/ DESTDIR=/

13
parser/po/Makefile
View File

@ -14,15 +14,8 @@ all:
# DISABLED LANGS = ar # 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 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
include ../common/Make-po.rules
COMMONDIR=../../common/ ../common/Make-po.rules:
make -C .. common/Make.rules
include Make.rules
XGETTEXT_ARGS+=--language=C --keyword=_ $(shell if [ -f ${NAME}.pot ] ; then echo -n -j ; fi) 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

8
profiles/Makefile
View File

@ -24,12 +24,12 @@ NAME=apparmor-profiles
ALL: ALL:
COMMONDIR=../common/ COMMONDIR=../common/
include Make.rules include common/Make.rules
COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true)) COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true))
ifeq ($(COMMONDIR_EXISTS), true) ifeq ($(COMMONDIR_EXISTS), true)
Make.rules: $(COMMONDIR)/Make.rules common/Make.rules: $(COMMONDIR)/Make.rules
ln -f $(COMMONDIR)/Make.rules ln -sf $(COMMONDIR) .
endif endif
DESTDIR=/ DESTDIR=/
@ -51,7 +51,7 @@ install:
.PHONY: clean .PHONY: clean
clean: clean:
-rm -f $(NAME)-$(VERSION)*.tar.gz -rm -f $(NAME)-$(VERSION)*.tar.gz Make.rules
ifndef VERBOSE ifndef VERBOSE
Q=@ Q=@

2
profiles/apparmor-profiles.spec.in
View File

@ -24,7 +24,7 @@
Summary: AppArmor profiles Summary: AppArmor profiles
Name: apparmor-profiles Name: apparmor-profiles
Version: @@immunix_version@@ Version: @@immunix_version@@
Release: 12 Release: @@repo_version@@
Group: Productivity/Security Group: Productivity/Security
Source0: %{name}-%{version}-@@repo_version@@.tar.gz Source0: %{name}-%{version}-@@repo_version@@.tar.gz
License: GPL License: GPL

17
utils/Makefile
View File

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

2
utils/apparmor-utils.spec.in
View File

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

13
utils/po/Makefile
View File

@ -20,15 +20,8 @@ all:
# made/installed. # 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 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
../common/Make-po.rules:
include Make.rules make -C .. common/Make.rules
XGETTEXT_ARGS+=--language=perl 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