From d3b03918011933085c198d837a18825f5685745e Mon Sep 17 00:00:00 2001 From: okuji Date: Mon, 21 Jun 1999 17:42:31 +0000 Subject: [PATCH] fix a dist bug --- ChangeLog | 5 +++ Makefile.in | 61 ++++++++++++++++----------- THANKS | 1 + aclocal.m4 | 10 +++-- configure | 88 ++++++++++++++++++++------------------- debian/Makefile.in | 9 ++-- docs/Makefile.in | 14 ++++--- e2fs_stage1_5/Makefile.in | 68 +++++++++++++++--------------- fat_stage1_5/Makefile.in | 68 +++++++++++++++--------------- ffs_stage1_5/Makefile.in | 68 +++++++++++++++--------------- grub/Makefile.in | 81 ++++++++++++++++++----------------- shared_src/Makefile.am | 6 +-- shared_src/Makefile.in | 37 +++++++++------- stage1/Makefile.in | 65 +++++++++++------------------ stage2/Makefile.in | 68 +++++++++++++++--------------- 15 files changed, 338 insertions(+), 311 deletions(-) diff --git a/ChangeLog b/ChangeLog index f75311dba..23c63b07f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-06-22 OKUJI Yoshinori + + * shared_src/Makefile.am (EXTRA_DIST): Add bios.c. Reported by + Pavel Roskin . + 1999-06-21 OKUJI Yoshinori * docs/Makefile.am (html): Deleted. diff --git a/Makefile.in b/Makefile.in index 196c21b56..89cd7b508 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,16 +59,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ @@ -78,15 +79,17 @@ SUBDIRS = grub stage1 stage2 \ DISTCLEANFILES = ssrcrules.mk EXTRA_DIST = BUGS +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = +DIST_SOURCES = DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 config.guess \ config.sub configure configure.in install-sh missing mkinstalldirs -DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best all: all-redirect @@ -163,15 +166,17 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -f$$here/ID $$unique $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -179,12 +184,14 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) mostlyclean-tags: @@ -203,11 +210,11 @@ top_distdir = $(distdir) # tarfile. distcheck: dist -rm -rf $(distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(TAR) xf - + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - mkdir $(distdir)/=build mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ + dc_install_base=`cd $(distdir)/=inst && pwd` \ + && cd $(distdir)/=build \ && ../configure --srcdir=.. --prefix=$$dc_install_base \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -222,17 +229,22 @@ distcheck: dist echo "$$banner"; \ echo "$$dashes" dist: distdir - -chmod -R a+r $(distdir) - tar ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz -rm -rf $(distdir) dist-all: distdir - -chmod -R a+r $(distdir) - tar ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) - -chmod 777 $(distdir) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ @@ -253,7 +265,6 @@ distdir: $(DISTFILES) test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ @@ -316,11 +327,11 @@ maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: install-recursive uninstall-recursive install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ diff --git a/THANKS b/THANKS index 363fce53c..02b573004 100644 --- a/THANKS +++ b/THANKS @@ -6,6 +6,7 @@ The following people made especially gracious contributions of their time and energy in helping to track down bugs, add new features, and generally assist in the GRUB maintainership process: +Alexander K. Hudek Bradford Hovinen Brian Brunswick Bryan Ford diff --git a/aclocal.m4 b/aclocal.m4 index 929c4ef1b..3e0d5ea71 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -152,14 +152,18 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) +dnl Set install_sh for make dist +install_sh="$missing_dir/install-sh" +test -f "$install_sh" || install_sh="$missing_dir/install.sh" +AC_SUBST(install_sh) dnl We check for tar when the user configures the end package. dnl This is sad, since we only need this for "dist". However, dnl there's no other good way to do it. We prefer GNU tar if dnl we can find it. If we can't find a tar, it doesn't really matter. -AC_CHECK_PROGS(TAR, gnutar gtar tar) +AC_CHECK_PROGS(AMTAR, gnutar gtar tar) AMTARFLAGS= -if test -n "$TAR"; then - if $SHELL -c "$TAR --version" > /dev/null 2>&1; then +if test -n "$AMTAR"; then + if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then dnl We have GNU tar. AMTARFLAGS=o fi diff --git a/configure b/configure index e3ea745f1..d6f8f5021 100644 --- a/configure +++ b/configure @@ -781,43 +781,46 @@ else echo "$ac_t""missing" 1>&6 fi +install_sh="$missing_dir/install-sh" +test -f "$install_sh" || install_sh="$missing_dir/install.sh" + for ac_prog in gnutar gtar tar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:790: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_TAR+set}\" = set"; then +echo "configure:793: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_AMTAR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$TAR"; then - ac_cv_prog_TAR="$TAR" # Let the user override the test. + if test -n "$AMTAR"; then + ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_TAR="$ac_prog" + ac_cv_prog_AMTAR="$ac_prog" break fi done IFS="$ac_save_ifs" fi fi -TAR="$ac_cv_prog_TAR" -if test -n "$TAR"; then - echo "$ac_t""$TAR" 1>&6 +AMTAR="$ac_cv_prog_AMTAR" +if test -n "$AMTAR"; then + echo "$ac_t""$AMTAR" 1>&6 else echo "$ac_t""no" 1>&6 fi -test -n "$TAR" && break +test -n "$AMTAR" && break done AMTARFLAGS= -if test -n "$TAR"; then - if $SHELL -c "$TAR --version" > /dev/null 2>&1; then +if test -n "$AMTAR"; then + if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then AMTARFLAGS=o fi fi @@ -826,7 +829,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:830: checking host system type" >&5 +echo "configure:833: checking host system type" >&5 if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then # Make sure we can run config.sub. @@ -892,7 +895,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:896: checking build system type" >&5 +echo "configure:899: checking build system type" >&5 if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then # Make sure we can run config.sub. @@ -939,7 +942,7 @@ fi # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:943: checking for $ac_word" >&5 +echo "configure:946: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -971,7 +974,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:975: checking for $ac_word" >&5 +echo "configure:978: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1001,7 +1004,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1005: checking for $ac_word" >&5 +echo "configure:1008: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1052,7 +1055,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1056: checking for $ac_word" >&5 +echo "configure:1059: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1084,7 +1087,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1088: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo "configure:1091: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1095,12 +1098,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1099 "configure" +#line 1102 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1126,12 +1129,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1130: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1133: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1135: checking whether we are using GNU C" >&5 +echo "configure:1138: checking whether we are using GNU C" >&5 if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1140,7 +1143,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1159,7 +1162,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1163: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1166: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1197,7 +1200,7 @@ CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused" # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1201: checking for $ac_word" >&5 +echo "configure:1204: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_LD+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1229,7 +1232,7 @@ fi # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ac_tool_prefix}objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1233: checking for $ac_word" >&5 +echo "configure:1236: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_OBJCOPY+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1262,7 +1265,7 @@ fi # Defined in acinclude.m4. echo $ac_n "checking symbol names produced by ${CC-cc}""... $ac_c" 1>&6 -echo "configure:1266: checking symbol names produced by ${CC-cc}" >&5 +echo "configure:1269: checking symbol names produced by ${CC-cc}" >&5 if eval "test \"\${grub_cv_asm_ext_c+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1275,7 +1278,7 @@ func (int *list) } EOF -if { ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then : +if { ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then : else { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; } fi @@ -1304,7 +1307,7 @@ EOF echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses""... $ac_c" 1>&6 -echo "configure:1308: checking whether ${OBJCOPY} works for absolute addresses" >&5 +echo "configure:1311: checking whether ${OBJCOPY} works for absolute addresses" >&5 if eval "test \"\${grub_cv_prog_objcopy_absolute+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1316,21 +1319,21 @@ blah (void) } EOF -if { (eval echo configure:1320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : +if { (eval echo configure:1323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : else { echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; } fi grub_cv_prog_objcopy_absolute=yes for link_addr in 2000 8000 7C00; do - if { ac_try='${LD-ld} -N -Ttext $link_addr conftest.o -o conftest.exec'; { (eval echo configure:1326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${LD-ld} -N -Ttext $link_addr conftest.o -o conftest.exec'; { (eval echo configure:1329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${LD-ld} cannot link at address $link_addr" 1>&2; exit 1; } fi - if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; } fi - if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then mv -f conftest conftest.old else grub_cv_prog_objcopy_absolute=no @@ -1347,7 +1350,7 @@ fi echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6 -echo "configure:1351: checking for .code16 addr32 assembler support" >&5 +echo "configure:1354: checking for .code16 addr32 assembler support" >&5 if eval "test \"\${grub_cv_asm_addr32+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1357,7 +1360,7 @@ l1: addr32 movb %al, l1 EOF -if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then grub_cv_asm_addr32=yes else grub_cv_asm_addr32=no @@ -1373,7 +1376,7 @@ fi # Check for curses libraries if we are building /sbin/grub. if test -n "$sbingrub"; then echo $ac_n "checking for getch in -lncurses""... $ac_c" 1>&6 -echo "configure:1377: checking for getch in -lncurses" >&5 +echo "configure:1380: checking for getch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'getch | sed 'y%./+-%__p_%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1381,7 +1384,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1415,7 +1418,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getch in -lcurses""... $ac_c" 1>&6 -echo "configure:1419: checking for getch in -lcurses" >&5 +echo "configure:1422: checking for getch in -lcurses" >&5 ac_lib_var=`echo curses'_'getch | sed 'y%./+-%__p_%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1423,7 +1426,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1651,7 +1654,8 @@ s%@AUTOCONF@%$AUTOCONF%g s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g -s%@TAR@%$TAR%g +s%@install_sh@%$install_sh%g +s%@AMTAR@%$AMTAR%g s%@AMTARFLAGS@%$AMTARFLAGS%g s%@SET_MAKE@%$SET_MAKE%g s%@host@%$host%g diff --git a/debian/Makefile.in b/debian/Makefile.in index 6b23fcf3d..cf89303da 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -59,26 +59,29 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ EXTRA_DIST = README.debian changelog control copyright rules +subdir = debian mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = +DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best all: all-redirect @@ -96,8 +99,6 @@ TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = debian - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ diff --git a/docs/Makefile.in b/docs/Makefile.in index 547bac946..9f79ad349 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -59,23 +59,26 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ info_TEXINFOS = grub.texi multiboot.texi EXTRA_DIST = menu.lst +subdir = docs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = +DIST_SOURCES = TEXI2DVI = texi2dvi INFO_DEPS = grub.info multiboot.info DVIS = grub.dvi multiboot.dvi @@ -84,7 +87,7 @@ DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \ version.texi -DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best all: all-redirect @@ -202,8 +205,9 @@ uninstall-info: @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ + d=$(srcdir); \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file"; \ + install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file; \ done; \ else :; fi @$(NORMAL_UNINSTALL) @@ -254,8 +258,6 @@ TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = docs - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ diff --git a/e2fs_stage1_5/Makefile.in b/e2fs_stage1_5/Makefile.in index 0c1b75ef6..c44a7e37d 100644 --- a/e2fs_stage1_5/Makefile.in +++ b/e2fs_stage1_5/Makefile.in @@ -57,16 +57,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ # Stage 1.5 can be installed into the first cylinder after MBR, so the @@ -97,6 +98,7 @@ e2fs_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \ DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P) e2fs_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables DISTFILES = $(DIST_COMMON) +subdir = e2fs_stage1_5 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) @@ -106,13 +108,15 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -e2fs_stage1_5_exec_OBJECTS = dummy.o +am_e2fs_stage1_5_exec_OBJECTS = dummy.o +e2fs_stage1_5_exec_OBJECTS = $(am_e2fs_stage1_5_exec_OBJECTS) e2fs_stage1_5_exec_DEPENDENCIES = asm.o common.o char_io.o disk_io.o \ stage1_5.o fsys_ext2fs.o bios.o e2fs_stage1_5_exec_LDFLAGS = CFLAGS = @CFLAGS@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(e2fs_stage1_5_exec_SOURCES) DATA = $(pkgdata_DATA) DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in @@ -120,11 +124,11 @@ DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in GZIP_ENV = --best SOURCES = $(e2fs_stage1_5_exec_SOURCES) -OBJECTS = $(e2fs_stage1_5_exec_OBJECTS) +OBJECTS = $(am_e2fs_stage1_5_exec_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s +.SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu e2fs_stage1_5/Makefile @@ -142,12 +146,6 @@ distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: -rm -f *.o core *.core @@ -157,6 +155,8 @@ distclean-compile: -rm -f *.tab.c maintainer-clean-compile: +.c.o: + $(COMPILE) -c $< install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) @@ -178,23 +178,27 @@ uninstall-pkgdataDATA: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) mostlyclean-tags: @@ -207,8 +211,6 @@ maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = e2fs_stage1_5 - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ @@ -240,23 +242,23 @@ distclean-depend: maintainer-clean-depend: %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + @echo '$(COMPILE) -c -o $@ $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< + @-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm .deps/$(*D)/$(*F).pp %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @echo '$(LTCOMPILE) -c -o $@ $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm -f .deps/$(*D)/$(*F).pp info-am: info: info-am dvi-am: diff --git a/fat_stage1_5/Makefile.in b/fat_stage1_5/Makefile.in index 01173fa78..6f5d7e3b7 100644 --- a/fat_stage1_5/Makefile.in +++ b/fat_stage1_5/Makefile.in @@ -57,16 +57,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ # Stage 1.5 can be installed into the first cylinder after MBR, so the @@ -96,6 +97,7 @@ fat_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \ DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P) fat_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables DISTFILES = $(DIST_COMMON) +subdir = fat_stage1_5 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) @@ -105,13 +107,15 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -fat_stage1_5_exec_OBJECTS = dummy.o +am_fat_stage1_5_exec_OBJECTS = dummy.o +fat_stage1_5_exec_OBJECTS = $(am_fat_stage1_5_exec_OBJECTS) fat_stage1_5_exec_DEPENDENCIES = asm.o common.o char_io.o disk_io.o \ stage1_5.o fsys_fat.o bios.o fat_stage1_5_exec_LDFLAGS = CFLAGS = @CFLAGS@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(fat_stage1_5_exec_SOURCES) DATA = $(pkgdata_DATA) DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in @@ -119,11 +123,11 @@ DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in GZIP_ENV = --best SOURCES = $(fat_stage1_5_exec_SOURCES) -OBJECTS = $(fat_stage1_5_exec_OBJECTS) +OBJECTS = $(am_fat_stage1_5_exec_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s +.SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu fat_stage1_5/Makefile @@ -141,12 +145,6 @@ distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: -rm -f *.o core *.core @@ -156,6 +154,8 @@ distclean-compile: -rm -f *.tab.c maintainer-clean-compile: +.c.o: + $(COMPILE) -c $< install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) @@ -177,23 +177,27 @@ uninstall-pkgdataDATA: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) mostlyclean-tags: @@ -206,8 +210,6 @@ maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = fat_stage1_5 - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ @@ -239,23 +241,23 @@ distclean-depend: maintainer-clean-depend: %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + @echo '$(COMPILE) -c -o $@ $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< + @-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm .deps/$(*D)/$(*F).pp %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @echo '$(LTCOMPILE) -c -o $@ $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm -f .deps/$(*D)/$(*F).pp info-am: info: info-am dvi-am: diff --git a/ffs_stage1_5/Makefile.in b/ffs_stage1_5/Makefile.in index 734cdbbbf..4cad4fb17 100644 --- a/ffs_stage1_5/Makefile.in +++ b/ffs_stage1_5/Makefile.in @@ -57,16 +57,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ @@ -94,6 +95,7 @@ ffs_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \ DEP_FILES = .deps/dummy.c $(wildcard .deps/*.P) ffs_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables DISTFILES = $(DIST_COMMON) +subdir = ffs_stage1_5 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) @@ -103,13 +105,15 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -ffs_stage1_5_exec_OBJECTS = dummy.o +am_ffs_stage1_5_exec_OBJECTS = dummy.o +ffs_stage1_5_exec_OBJECTS = $(am_ffs_stage1_5_exec_OBJECTS) ffs_stage1_5_exec_DEPENDENCIES = asm.o common.o char_io.o disk_io.o \ stage1_5.o fsys_ffs.o bios.o ffs_stage1_5_exec_LDFLAGS = CFLAGS = @CFLAGS@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(ffs_stage1_5_exec_SOURCES) DATA = $(pkgdata_DATA) DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in @@ -117,11 +121,11 @@ DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in GZIP_ENV = --best SOURCES = $(ffs_stage1_5_exec_SOURCES) -OBJECTS = $(ffs_stage1_5_exec_OBJECTS) +OBJECTS = $(am_ffs_stage1_5_exec_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s +.SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu ffs_stage1_5/Makefile @@ -139,12 +143,6 @@ distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: -rm -f *.o core *.core @@ -154,6 +152,8 @@ distclean-compile: -rm -f *.tab.c maintainer-clean-compile: +.c.o: + $(COMPILE) -c $< install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) @@ -175,23 +175,27 @@ uninstall-pkgdataDATA: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) mostlyclean-tags: @@ -204,8 +208,6 @@ maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = ffs_stage1_5 - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ @@ -237,23 +239,23 @@ distclean-depend: maintainer-clean-depend: %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + @echo '$(COMPILE) -c -o $@ $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< + @-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm .deps/$(*D)/$(*F).pp %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @echo '$(LTCOMPILE) -c -o $@ $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm -f .deps/$(*D)/$(*F).pp info-am: info: info-am dvi-am: diff --git a/grub/Makefile.in b/grub/Makefile.in index 933e78a21..ae75cc1a0 100644 --- a/grub/Makefile.in +++ b/grub/Makefile.in @@ -59,16 +59,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ @@ -86,6 +87,7 @@ grub_LDADD = boot.o common.o char_io.o cmdline.o disk_io.o gunzip.o \ # FIXME: Automake hackery. DEP_FILES = .deps/main.P .deps/asmstub.P $(wildcard .deps/*.P) +subdir = grub mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(sbin_PROGRAMS) @@ -95,25 +97,27 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -grub_OBJECTS = main.o asmstub.o +am_grub_OBJECTS = main.o asmstub.o +grub_OBJECTS = $(am_grub_OBJECTS) grub_DEPENDENCIES = boot.o common.o char_io.o cmdline.o disk_io.o \ gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o grub_LDFLAGS = CFLAGS = @CFLAGS@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(grub_SOURCES) DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best SOURCES = $(grub_SOURCES) -OBJECTS = $(grub_OBJECTS) +OBJECTS = $(am_grub_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s +.SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu grub/Makefile @@ -136,25 +140,20 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(sbindir) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \ + f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ + echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/$$f"; \ + $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/$$f; \ else :; fi; \ done uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - file="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " rm -f $(DESTDIR)$(sbindir)/$$file"; \ - rm -f $(DESTDIR)$(sbindir)/$$file; \ + f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ + echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ + rm -f $(DESTDIR)$(sbindir)/$$f; \ done -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: -rm -f *.o core *.core @@ -168,26 +167,32 @@ maintainer-clean-compile: grub: $(grub_OBJECTS) $(grub_DEPENDENCIES) @rm -f grub $(LINK) $(grub_LDFLAGS) $(grub_OBJECTS) $(grub_LDADD) $(LIBS) +.c.o: + $(COMPILE) -c $< tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) mostlyclean-tags: @@ -200,8 +205,6 @@ maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = grub - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ @@ -233,23 +236,23 @@ distclean-depend: maintainer-clean-depend: %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + @echo '$(COMPILE) -c -o $@ $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< + @-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm .deps/$(*D)/$(*F).pp %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @echo '$(LTCOMPILE) -c -o $@ $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm -f .deps/$(*D)/$(*F).pp info-am: info: info-am dvi-am: diff --git a/shared_src/Makefile.am b/shared_src/Makefile.am index 29955671d..b4fc580f6 100644 --- a/shared_src/Makefile.am +++ b/shared_src/Makefile.am @@ -2,6 +2,6 @@ noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \ fat.h filesys.h freebsd.h fs.h i386-elf.h imgact_aout.h \ mb_header.h mb_info.h pc_slice.h shared.h smp-imps.h -EXTRA_DIST = asm.S boot.c char_io.c cmdline.c common.c disk_io.c \ - fsys_ext2fs.c fsys_fat.c fsys_ffs.c gunzip.c smp-imps.c \ - stage1_5.c stage2.c +EXTRA_DIST = asm.S bios.c boot.c char_io.c cmdline.c common.c \ + disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c gunzip.c \ + smp-imps.c stage1_5.c stage2.c diff --git a/shared_src/Makefile.in b/shared_src/Makefile.in index 6fd82c6bf..a4806c848 100644 --- a/shared_src/Makefile.in +++ b/shared_src/Makefile.in @@ -59,16 +59,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ @@ -77,18 +78,20 @@ noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \ mb_header.h mb_info.h pc_slice.h shared.h smp-imps.h -EXTRA_DIST = asm.S boot.c char_io.c cmdline.c common.c disk_io.c \ - fsys_ext2fs.c fsys_fat.c fsys_ffs.c gunzip.c smp-imps.c \ - stage1_5.c stage2.c +EXTRA_DIST = asm.S bios.c boot.c char_io.c cmdline.c common.c \ + disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c gunzip.c \ + smp-imps.c stage1_5.c stage2.c +subdir = shared_src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = +DIST_SOURCES = HEADERS = $(noinst_HEADERS) DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best all: all-redirect @@ -103,23 +106,27 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) mostlyclean-tags: @@ -132,8 +139,6 @@ maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = shared_src - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ diff --git a/stage1/Makefile.in b/stage1/Makefile.in index d3ae946dc..f0ac4f05c 100644 --- a/stage1/Makefile.in +++ b/stage1/Makefile.in @@ -57,16 +57,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ @@ -79,6 +80,7 @@ COMPILE = $(CC) -fno-builtin -nostdinc $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) noinst_PROGRAMS = stage1.exec stage1_exec_SOURCES = stage1.S +subdir = stage1 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) @@ -88,28 +90,30 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -stage1_exec_OBJECTS = stage1.o +am_stage1_exec_OBJECTS = stage1.o +stage1_exec_OBJECTS = $(am_stage1_exec_OBJECTS) stage1_exec_LDADD = $(LDADD) stage1_exec_DEPENDENCIES = stage1_exec_LDFLAGS = CFLAGS = @CFLAGS@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(stage1_exec_SOURCES) DATA = $(pkgdata_DATA) DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best DEP_FILES = .deps/stage1.P SOURCES = $(stage1_exec_SOURCES) -OBJECTS = $(stage1_exec_OBJECTS) +OBJECTS = $(am_stage1_exec_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s +.SUFFIXES: .S .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu stage1/Makefile @@ -127,12 +131,6 @@ distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: -rm -f *.o core *.core @@ -142,6 +140,8 @@ distclean-compile: -rm -f *.tab.c maintainer-clean-compile: +.S.o: + $(COMPILE) -c $< install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) @@ -163,23 +163,27 @@ uninstall-pkgdataDATA: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) mostlyclean-tags: @@ -192,8 +196,6 @@ maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = stage1 - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ @@ -223,25 +225,6 @@ distclean-depend: -rm -rf .deps maintainer-clean-depend: - -%.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - -%.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: diff --git a/stage2/Makefile.in b/stage2/Makefile.in index a1c9f28fe..4ecba7d7b 100644 --- a/stage2/Makefile.in +++ b/stage2/Makefile.in @@ -57,16 +57,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ +AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CC = @CC@ LD = @LD@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ -TAR = @TAR@ VERSION = @VERSION@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ +install_sh = @install_sh@ sbingrub = @sbingrub@ @@ -90,6 +91,7 @@ noinst_PROGRAMS = stage2.exec DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P) stage2_exec_SOURCES = dummy.c # needed to drag in C Makefile variables DISTFILES = $(DIST_COMMON) +subdir = stage2 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) @@ -99,13 +101,15 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -stage2_exec_OBJECTS = dummy.o +am_stage2_exec_OBJECTS = dummy.o +stage2_exec_OBJECTS = $(am_stage2_exec_OBJECTS) stage2_exec_DEPENDENCIES = asm.o boot.o common.o char_io.o cmdline.o \ disk_io.o gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o bios.o stage2_exec_LDFLAGS = CFLAGS = @CFLAGS@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = $(stage2_exec_SOURCES) DATA = $(pkgdata_DATA) DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in @@ -113,11 +117,11 @@ DIST_COMMON = $(pkgdata_DATA) Makefile.am Makefile.in GZIP_ENV = --best SOURCES = $(stage2_exec_SOURCES) -OBJECTS = $(stage2_exec_OBJECTS) +OBJECTS = $(am_stage2_exec_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s +.SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu stage2/Makefile @@ -135,12 +139,6 @@ distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: -rm -f *.o core *.core @@ -150,6 +148,8 @@ distclean-compile: -rm -f *.tab.c maintainer-clean-compile: +.c.o: + $(COMPILE) -c $< install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) @@ -171,23 +171,27 @@ uninstall-pkgdataDATA: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) mostlyclean-tags: @@ -200,8 +204,6 @@ maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = stage2 - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ @@ -233,23 +235,23 @@ distclean-depend: maintainer-clean-depend: %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + @echo '$(COMPILE) -c -o $@ $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< + @-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm .deps/$(*D)/$(*F).pp %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @echo '$(LTCOMPILE) -c -o $@ $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ + < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \ + tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp + >> .deps/$(*D)/$(*F).P; \ + rm -f .deps/$(*D)/$(*F).pp info-am: info: info-am dvi-am: