More tweaks. Add windres documentation.

[deliverable/binutils-gdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f1acf87a73138f86f5a8b9865968950fa7590a47..8d5bfd51303b5de786f50e8dd35dc69be4d97424 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,6 +87,7 @@ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 RANLIB = ranlib
 
 DLLTOOL = dlltool
+WINDRES = windres
 
 NM = nm
 
@@ -263,6 +264,17 @@ DLLTOOL_FOR_TARGET = ` \
     fi; \
   fi`
 
+WINDRES_FOR_TARGET = ` \
+  if [ -f $$r/binutils/windres ] ; then \
+    echo $$r/binutils/windres ; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(WINDRES); \
+    else \
+       t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
 AR_FOR_TARGET = ` \
   if [ -f $$r/binutils/ar ] ; then \
     echo $$r/binutils/ar ; \
@@ -341,6 +353,7 @@ BASE_FLAGS_TO_PASS = \
        "EXPECT=$(EXPECT)" \
        "RUNTEST=$(RUNTEST)" \
        "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+       "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
        "YACC=$(BISON)" \
        "exec_prefix=$(exec_prefix)" \
        "prefix=$(prefix)" \
@@ -357,8 +370,8 @@ EXTRA_HOST_FLAGS = \
        'DLLTOOL=$(DLLTOOL)' \
        'LD=$(LD)' \
        'NM=$(NM)' \
-       'RANLIB=$(RANLIB)' 
-
+       'RANLIB=$(RANLIB)' \
+       'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
 
@@ -391,7 +404,8 @@ EXTRA_TARGET_FLAGS = \
        'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
        'NM=$$(NM_FOR_TARGET)' \
        'PICFLAG=$$(PICFLAG_FOR_TARGET)' \
-       'RANLIB=$$(RANLIB_FOR_TARGET)'
+       'RANLIB=$$(RANLIB_FOR_TARGET)' \
+       'WINDRES=$$(WINDRES_FOR_TARGET)'
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 
@@ -412,6 +426,7 @@ EXTRA_GCC_FLAGS = \
        'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
        'NM=$(NM)' \
        'RANLIB=$$(RANLIB_FOR_TARGET)' \
+       'WINDRES=$$(WINDRES_FOR_TARGET)' \
        "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
        `if test x"$(LANGUAGES)" != x; then echo "LANGUAGES=$(LANGUAGES)"; fi` \
        `if test x"$(STMP_FIXPROTO)" != x; then echo "STMP_FIXPROTO=$(STMP_FIXPROTO)"; fi` \
@@ -681,6 +696,7 @@ ALL_TARGET_MODULES = \
        all-target-winsup \
        all-target-libgloss \
        all-target-libiberty \
+       all-target-gperf \
        all-target-examples
 
 # This is a list of the configure targets for all of the modules which
@@ -694,6 +710,7 @@ CONFIGURE_TARGET_MODULES = \
        configure-target-winsup \
        configure-target-libgloss \
        configure-target-libiberty \
+       configure-target-gperf \
        configure-target-examples
 
 # This is a list of the check targets for all of the modules which are
@@ -704,7 +721,8 @@ CHECK_TARGET_MODULES = \
        check-target-libg++ \
        check-target-newlib \
        check-target-winsup \
-       check-target-libiberty
+       check-target-libiberty \
+       check-target-gperf
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(TARGET_FLAGS_TO_PASS).
@@ -715,7 +733,8 @@ INSTALL_TARGET_MODULES = \
        install-target-newlib \
        install-target-winsup \
        install-target-libgloss \
-       install-target-libiberty
+       install-target-libiberty \
+       install-target-gperf
 
 # This is a list of the targets for which we can do a clean-{target}.
 CLEAN_MODULES = \
@@ -794,6 +813,7 @@ CLEAN_TARGET_MODULES = \
        clean-target-winsup \
        clean-target-libgloss \
        clean-target-libiberty \
+       clean-target-gperf \
        clean-target-examples
 
 # All of the x11 modules that can be cleaned
@@ -856,12 +876,12 @@ $(DO_X):
              done; \
              ;; \
            esac ; \
-           export AR AS CC CXX LD NM RANLIB DLLTOOL; \
+           export AR AS CC CXX LD NM RANLIB DLLTOOL WINDRES; \
            if (cd ./$$i; \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "RANLIB=$${RANLIB}" \
-                       "DLLTOOL=$${DLLTOOL}" \
+                       "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                        $${target}); \
            then true; else exit 1; fi; \
          else true; fi; \
@@ -875,12 +895,12 @@ $(DO_X):
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
            done; \
-           export AR AS CC CXX LD NM RANLIB DLLTOOL; \
+           export AR AS CC CXX LD NM RANLIB DLLTOOL WINDRES; \
            if (cd $(TARGET_SUBDIR)/$$i; \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "RANLIB=$${RANLIB}" \
-                       "DLLTOOL=$${DLLTOOL}" \
+                       "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                        $${target}); \
            then true; else exit 1; fi; \
          else true; fi; \
@@ -1135,6 +1155,7 @@ $(CONFIGURE_TARGET_MODULES):
             LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
            NM="$(NM_FOR_TARGET)"; export NM; \
            RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
            echo Configuring in $(TARGET_SUBDIR)/$${dir}; \
            cd $(TARGET_SUBDIR)/$${dir}; \
            case $(srcdir) in \
@@ -1370,6 +1391,8 @@ all-bootstrap: all-libiberty all-byacc all-binutils all-gas all-ld
 GDB_TK = all-tk all-tcl
 all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
 all-gnuserv:
+configure-target-gperf: $(ALL_GCC)
+all-target-gperf: configure-target-gperf all-target-libiberty all-target-libg++
 all-gprof: all-libiberty all-bfd all-opcodes
 all-grep: all-libiberty
 all-grez: all-libiberty all-bfd all-opcodes
@@ -1415,7 +1438,7 @@ all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
 all-sim: all-libiberty all-bfd all-opcodes
-all-sn: all-tcl all-tk all-itcl all-db
+all-sn: all-tcl all-tk all-itcl all-db all-grep
 all-tar: all-libiberty
 all-tcl:
 all-tclX: all-tcl all-tk