diff options
author | Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> | 2011-03-22 16:08:27 -0700 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> | 2011-03-22 16:08:27 -0700 |
commit | f1672adf5b7bbcb250b3cbee2538aca025314c48 (patch) | |
tree | 3f49a3679fbc14b4919e832de339cafed3276e93 | |
parent | 3f0448d3b5c4c71f56631fd562b7f65c3a582a16 (diff) |
automake: fix missing/extra distroed files
Some files were missing (specially important the LICENSE one), and
others were being distributed when they are auto generated at build
time (*version*).
Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | bin/Makefile.am | 6 | ||||
-rw-r--r-- | bin/Makefile.in | 87 | ||||
-rw-r--r-- | include/Makefile.am | 5 | ||||
-rw-r--r-- | include/Makefile.in | 48 | ||||
-rw-r--r-- | include/wimaxll/Makefile.am | 5 | ||||
-rw-r--r-- | include/wimaxll/Makefile.in | 43 |
8 files changed, 144 insertions, 57 deletions
diff --git a/Makefile.am b/Makefile.am index 41f191f..ed35292 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,4 +8,5 @@ MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ ltmain.sh depcomp missing install-sh mkinstalldirs -EXTRADIST = bootstrap bootstrap-configure +EXTRA_DIST = bootstrap bootstrap-configure mk-archive lib/config.h.in \ + .gitignore CHANGELOG LICENSE bootstrap bootstrap-configure diff --git a/Makefile.in b/Makefile.in index 7198e8c..61f6aed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -266,7 +266,9 @@ MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ ltmain.sh depcomp missing install-sh mkinstalldirs -EXTRADIST = bootstrap bootstrap-configure +EXTRA_DIST = bootstrap bootstrap-configure mk-archive lib/config.h.in \ + .gitignore CHANGELOG LICENSE bootstrap bootstrap-configure + all: all-recursive .SUFFIXES: diff --git a/bin/Makefile.am b/bin/Makefile.am index 04fc860..c19b746 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -7,13 +7,13 @@ INCLUDES = \ LDADD = ../lib/libwimaxll.la $(LIBNL1_LIBS) -bin_SCRIPTS = \ - wimax-tools-version \ +dist_bin_SCRIPTS = \ wimaxll-reset \ wimaxll-rfkill \ wimaxll-wait-for-state-change -EXTRA_DIST = $(bin_SCRIPTS) +nodist_bin_SCRIPTS = \ + wimax-tools-version bin_PROGRAMS = \ wimaxll diff --git a/bin/Makefile.in b/bin/Makefile.in index b92e3fa..e68f198 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -38,8 +38,8 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = wimaxll$(EXEEXT) subdir = bin -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/wimax-tools-version.in +DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/wimax-tools-version.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -70,7 +70,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(bindir)" + "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" LTLIBRARIES = $(plugin_LTLIBRARIES) wimaxll_pl_reset_la_LIBADD = wimaxll_pl_reset_la_SOURCES = wimaxll-pl-reset.c @@ -111,7 +111,7 @@ am__DEPENDENCIES_1 = wimaxll_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(wimaxll_LDFLAGS) $(LDFLAGS) -o $@ -SCRIPTS = $(bin_SCRIPTS) +SCRIPTS = $(dist_bin_SCRIPTS) $(nodist_bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -273,13 +273,14 @@ INCLUDES = \ $(I2400M_INCLUDES) LDADD = ../lib/libwimaxll.la $(LIBNL1_LIBS) -bin_SCRIPTS = \ - wimax-tools-version \ +dist_bin_SCRIPTS = \ wimaxll-reset \ wimaxll-rfkill \ wimaxll-wait-for-state-change -EXTRA_DIST = $(bin_SCRIPTS) +nodist_bin_SCRIPTS = \ + wimax-tools-version + AM_CFLAGS = @GLIB_CFLAGS@ -DPLUGINDIR=\""$(plugindir)"\" AM_LDFLAGS = @GLIB_LIBS@ ../lib/libwimaxll.la $(LIBNL1_LIBS) wimaxll_LDFLAGS = $(AM_LDFLAGS) -ldl -Wl,--export-dynamic -Wl,--version-script=wimaxll.ver @@ -420,10 +421,44 @@ clean-binPROGRAMS: wimaxll$(EXEEXT): $(wimaxll_OBJECTS) $(wimaxll_DEPENDENCIES) @rm -f wimaxll$(EXEEXT) $(AM_V_CCLD)$(wimaxll_LINK) $(wimaxll_OBJECTS) $(wimaxll_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) +install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-dist_binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files +install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -446,9 +481,9 @@ install-binSCRIPTS: $(bin_SCRIPTS) } \ ; done -uninstall-binSCRIPTS: +uninstall-nodist_binSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ + @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ test -n "$$list" || exit 0; \ @@ -583,7 +618,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) installdirs: - for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -641,7 +676,8 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-binSCRIPTS +install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \ + install-nodist_binSCRIPTS install-html: install-html-am @@ -681,8 +717,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-pluginLTLIBRARIES +uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ + uninstall-nodist_binSCRIPTS uninstall-pluginLTLIBRARIES .MAKE: install-am install-strip @@ -691,16 +727,17 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-binSCRIPTS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pluginLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-binSCRIPTS uninstall-pluginLTLIBRARIES + install-data install-data-am install-dist_binSCRIPTS \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-nodist_binSCRIPTS install-pdf \ + install-pdf-am install-pluginLTLIBRARIES install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ + uninstall-nodist_binSCRIPTS uninstall-pluginLTLIBRARIES wimaxll.exp: $(wimaxll_OBJECTS) diff --git a/include/Makefile.am b/include/Makefile.am index a2c16bd..d15c75f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = wimaxll -include_HEADERS = \ - wimaxll.h wimaxll-version.h
\ No newline at end of file +include_HEADERS = wimaxll.h + +nodist_include_HEADERS = wimaxll-version.h diff --git a/include/Makefile.in b/include/Makefile.in index 63ec6c5..e467da4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -82,8 +82,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(includedir)" -HEADERS = $(include_HEADERS) +am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" +HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -241,9 +241,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = wimaxll -include_HEADERS = \ - wimaxll.h wimaxll-version.h - +include_HEADERS = wimaxll.h +nodist_include_HEADERS = wimaxll-version.h all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -323,6 +322,26 @@ uninstall-includeHEADERS: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(includedir)" && rm -f $$files +install-nodist_includeHEADERS: $(nodist_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" + @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ + done + +uninstall-nodist_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(includedir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -522,7 +541,7 @@ check: check-recursive all-am: Makefile $(HEADERS) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -570,7 +589,7 @@ info: info-recursive info-am: -install-data-am: install-includeHEADERS +install-data-am: install-includeHEADERS install-nodist_includeHEADERS install-dvi: install-dvi-recursive @@ -614,7 +633,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-includeHEADERS +uninstall-am: uninstall-includeHEADERS uninstall-nodist_includeHEADERS .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ ctags-recursive install-am install-strip tags-recursive @@ -627,12 +646,13 @@ uninstall-am: uninstall-includeHEADERS install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-includeHEADERS install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-includeHEADERS + install-man install-nodist_includeHEADERS install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-includeHEADERS uninstall-nodist_includeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/include/wimaxll/Makefile.am b/include/wimaxll/Makefile.am index 56fa615..59e91e7 100644 --- a/include/wimaxll/Makefile.am +++ b/include/wimaxll/Makefile.am @@ -2,5 +2,6 @@ wimaxllincludedir = @includedir@/wimaxll wimaxllinclude_HEADERS = \ cmd.h \ i2400m.h \ - log.h \ - version.h + log.h + +nodist_wimaxllinclude_HEADERS = version.h diff --git a/include/wimaxll/Makefile.in b/include/wimaxll/Makefile.in index f02457a..3dad4fd 100644 --- a/include/wimaxll/Makefile.in +++ b/include/wimaxll/Makefile.in @@ -74,8 +74,9 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(wimaxllincludedir)" -HEADERS = $(wimaxllinclude_HEADERS) +am__installdirs = "$(DESTDIR)$(wimaxllincludedir)" \ + "$(DESTDIR)$(wimaxllincludedir)" +HEADERS = $(nodist_wimaxllinclude_HEADERS) $(wimaxllinclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -205,9 +206,9 @@ wimaxllincludedir = @includedir@/wimaxll wimaxllinclude_HEADERS = \ cmd.h \ i2400m.h \ - log.h \ - version.h + log.h +nodist_wimaxllinclude_HEADERS = version.h all: all-am .SUFFIXES: @@ -249,6 +250,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-nodist_wimaxllincludeHEADERS: $(nodist_wimaxllinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(wimaxllincludedir)" || $(MKDIR_P) "$(DESTDIR)$(wimaxllincludedir)" + @list='$(nodist_wimaxllinclude_HEADERS)'; test -n "$(wimaxllincludedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(wimaxllincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(wimaxllincludedir)" || exit $$?; \ + done + +uninstall-nodist_wimaxllincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_wimaxllinclude_HEADERS)'; test -n "$(wimaxllincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(wimaxllincludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(wimaxllincludedir)" && rm -f $$files install-wimaxllincludeHEADERS: $(wimaxllinclude_HEADERS) @$(NORMAL_INSTALL) test -z "$(wimaxllincludedir)" || $(MKDIR_P) "$(DESTDIR)$(wimaxllincludedir)" @@ -356,7 +377,7 @@ check-am: all-am check: check-am all-am: Makefile $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(wimaxllincludedir)"; do \ + for dir in "$(DESTDIR)$(wimaxllincludedir)" "$(DESTDIR)$(wimaxllincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -404,7 +425,8 @@ info: info-am info-am: -install-data-am: install-wimaxllincludeHEADERS +install-data-am: install-nodist_wimaxllincludeHEADERS \ + install-wimaxllincludeHEADERS install-dvi: install-dvi-am @@ -448,7 +470,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-wimaxllincludeHEADERS +uninstall-am: uninstall-nodist_wimaxllincludeHEADERS \ + uninstall-wimaxllincludeHEADERS .MAKE: install-am install-strip @@ -458,12 +481,14 @@ uninstall-am: uninstall-wimaxllincludeHEADERS html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip \ + install-info-am install-man \ + install-nodist_wimaxllincludeHEADERS install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ install-wimaxllincludeHEADERS installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags uninstall uninstall-am \ + uninstall-nodist_wimaxllincludeHEADERS \ uninstall-wimaxllincludeHEADERS |