[smuxi/stable] Build: remove distdir hack from lib/Makefile.am



commit f9fd02c208361e229e16966c74f8e2decb11b5e5
Author: Mirco Bauer <meebey meebey net>
Date:   Sun Jan 31 21:41:32 2016 +0100

    Build: remove distdir hack from lib/Makefile.am
    
    make distcheck no longer fails without that rsync hack in the distdir target but
    started to fail with the hack, thus removing it.

 lib/Makefile.am |   74 -------------------------------------------------------
 1 files changed, 0 insertions(+), 74 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7b95015..ad62fc0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -312,77 +312,3 @@ if BUNDLE_DB4O
 #      $(XBUILD) $(DB4O_NQ_XBUILD_FLAGS) /t:Clean $(DB4O_NQ_BUILD_FILE)
 endif
 
-distdir: $(DISTFILES) $(DIST_SUBDIRS)
-       $(am__remove_distdir)
-       test -d "$(distdir)" || mkdir "$(distdir)"
-       @for DISTFILE in $(DISTFILES); do \
-               if [ -d "$$DISTFILE" ]; then \
-                       mkdir -p $(distdir)/$(srcdir)/$$DISTFILE; \
-                       rsync -a \
-                               --prune-empty-dirs \
-                               --include='*/' \
-                               --include='*.cs' \
-                               --exclude='*' \
-                               $$DISTFILE/ $(distdir)/$(srcdir)/$$DISTFILE; \
-               else \
-                       DISTFILES="$$DISTFILES $$DISTFILE"; \
-               fi \
-       done; \
-       srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list="$$DISTFILES"; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-                 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -z "$$file"; then continue; fi; \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-               dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-               if test -d "$(distdir)/$$file"; then \
-                 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-               fi; \
-               if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-                 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-                 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-               fi; \
-               cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-               test -f "$(distdir)/$$file" \
-               || cp -p $$d/$$file "$(distdir)/$$file" \
-               || exit 1; \
-         fi; \
-       done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           test -d "$(distdir)/$$subdir" \
-           || $(MKDIR_P) "$(distdir)/$$subdir" \
-           || exit 1; \
-         fi; \
-       done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-           $(am__relativize); \
-           new_distdir=$$reldir; \
-           dir1=$$subdir; dir2="$(top_distdir)"; \
-           $(am__relativize); \
-           new_top_distdir=$$reldir; \
-           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" 
distdir="$$new_distdir" \\"; \
-           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-           ($(am__cd) $$subdir && \
-             $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$$new_top_distdir" \
-               distdir="$$new_distdir" \
-               am__remove_distdir=: \
-               am__skip_length_check=: \
-               am__skip_mode_fix=: \
-               distdir) \
-             || exit 1; \
-         fi; \
-       done


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]