From: Arjen Baart <arjen@andromeda.nl>
Date: Fri, 24 May 2019 21:15:27 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.andromeda.nl/srv/git/ACL
X-Git-Tag: v0.1~2
X-Git-Url: http://www.andromeda.nl/gitweb/?a=commitdiff_plain;h=00d06ae570f24299c9245c550bb5c6954d7b61ad;p=libacl.git

Merge branch 'master' of ssh://git.andromeda.nl/srv/git/ACL
---

00d06ae570f24299c9245c550bb5c6954d7b61ad
diff --cc src/Makefile.in
index e0c4765,1a3603d..4050f4e
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -150,8 -153,7 +150,8 @@@ am__v_at_0 = 
  am__v_at_1 = 
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
 -am__depfiles_maybe = depfiles
 +am__maybe_remake_depfiles = depfiles
- am__depfiles_remade = ./$(DEPDIR)/string.Plo
++am__depfiles_remade = ./$(DEPDIR)/regex.Plo ./$(DEPDIR)/string.Plo
  am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@@ -403,13 -406,8 +403,14 @@@ mostlyclean-compile
  distclean-compile:
  	-rm -f *.tab.c
  
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@ # am--include-marker
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@ # am--include-marker
 +
 +$(am__depfiles_remade):
 +	@$(MKDIR_P) $(@D)
 +	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
 +
 +am--depfiles: $(am__depfiles_remade)
  
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@@ -587,7 -582,7 +588,8 @@@ clean-am: clean-generic clean-libLTLIBR
  	mostlyclean-am
  
  distclean: distclean-am
- 		-rm -f ./$(DEPDIR)/string.Plo
 -	-rm -rf ./$(DEPDIR)
++		-rm -f ./$(DEPDIR)/regex.Plo
++	-rm -f ./$(DEPDIR)/string.Plo
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
  	distclean-tags
@@@ -633,7 -628,7 +635,8 @@@ install-ps-am
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
- 		-rm -f ./$(DEPDIR)/string.Plo
 -	-rm -rf ./$(DEPDIR)
++		-rm -f ./$(DEPDIR)/regex.Plo
++	-rm -f ./$(DEPDIR)/string.Plo
  	-rm -f Makefile
  maintainer-clean-am: distclean-am maintainer-clean-generic
  
diff --cc test/Makefile.in
index 032235b,6148396..f8b954e
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@@ -88,10 -88,14 +88,11 @@@ POST_UNINSTALL = 
  build_triplet = @build@
  host_triplet = @host@
  check_PROGRAMS = string_assign$(EXEEXT) string_basics$(EXEEXT) \
- 	string_compare$(EXEEXT) string_cat$(EXEEXT)
+ 	string_compare$(EXEEXT) string_cat$(EXEEXT) \
+ 	string_substring$(EXEEXT) string_regex$(EXEEXT)
  subdir = test
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 -	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 -	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
 -	$(top_srcdir)/configure.ac
 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@@ -133,10 -145,7 +142,11 @@@ am__v_at_0 = 
  am__v_at_1 = 
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
 -am__depfiles_maybe = depfiles
 +am__maybe_remake_depfiles = depfiles
 +am__depfiles_remade = ./$(DEPDIR)/string_assign.Po \
 +	./$(DEPDIR)/string_basics.Po ./$(DEPDIR)/string_cat.Po \
- 	./$(DEPDIR)/string_compare.Po
++	./$(DEPDIR)/string_compare.Po ./$(DEPDIR)/string_regex.Po \
++	./$(DEPDIR)/string_substring.Po
  am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@@ -585,16 -607,12 +607,18 @@@ mostlyclean-compile
  distclean-compile:
  	-rm -f *.tab.c
  
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_assign.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_basics.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_cat.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_compare.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_regex.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_substring.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_assign.Po@am__quote@ # am--include-marker
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_basics.Po@am__quote@ # am--include-marker
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_cat.Po@am__quote@ # am--include-marker
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_compare.Po@am__quote@ # am--include-marker
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_regex.Po@am__quote@ # am--include-marker
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_substring.Po@am__quote@ # am--include-marker
 +
 +$(am__depfiles_remade):
 +	@$(MKDIR_P) $(@D)
 +	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
 +
 +am--depfiles: $(am__depfiles_remade)
  
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@@ -944,10 -973,7 +982,12 @@@ clean-am: clean-checkPROGRAMS clean-gen
  	mostlyclean-am
  
  distclean: distclean-am
 -	-rm -rf ./$(DEPDIR)
 +		-rm -f ./$(DEPDIR)/string_assign.Po
 +	-rm -f ./$(DEPDIR)/string_basics.Po
 +	-rm -f ./$(DEPDIR)/string_cat.Po
 +	-rm -f ./$(DEPDIR)/string_compare.Po
++	-rm -f ./$(DEPDIR)/string_regex.Po
++	-rm -f ./$(DEPDIR)/string_substring.Po
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
  	distclean-tags
@@@ -993,10 -1019,7 +1033,12 @@@ install-ps-am
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
 -	-rm -rf ./$(DEPDIR)
 +		-rm -f ./$(DEPDIR)/string_assign.Po
 +	-rm -f ./$(DEPDIR)/string_basics.Po
 +	-rm -f ./$(DEPDIR)/string_cat.Po
 +	-rm -f ./$(DEPDIR)/string_compare.Po
++	-rm -f ./$(DEPDIR)/string_regex.Po
++	-rm -f ./$(DEPDIR)/string_substring.Po
  	-rm -f Makefile
  maintainer-clean-am: distclean-am maintainer-clean-generic