2011-03-18 Phil Muldoon <pmuldoon@redhat.com>

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

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8c13e531c46dcc35b238be392088f0172323b8fc..489b1e9c5e33b5021f311c2e7addb02a5265eb2c 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -88,8 +88,6 @@ DEPMODE = @CCDEPMODE@
 DEPDIR = @DEPDIR@
 depcomp = $(SHELL) $(srcdir)/../depcomp
 
-PWD_COMMAND = $${PWDCMD-pwd}
-
 # Note that these are overridden by GNU make-specific code below if
 # GNU make is used.  The overrides implement dependency tracking.
 COMPILE.pre = $(CC)
@@ -142,10 +140,6 @@ LIBDECNUMBER = $(LIBDECNUMBER_DIR)/libdecnumber.a
 LIBDECNUMBER_SRC = $(srcdir)/$(LIBDECNUMBER_DIR)
 LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC)
 
-LIBCOMMON_DIR = common
-LIBCOMMON = $(LIBCOMMON_DIR)/libcommon.a
-LIBCOMMON_SRC = $(srcdir)/$(LIBCOMMON_DIR)
-
 # Where is the READLINE library?  Typically in ../readline.
 READLINE_DIR = ../readline
 READLINE_SRC = $(srcdir)/$(READLINE_DIR)
@@ -473,10 +467,9 @@ INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(MH_LDFLAGS) $(LDFLAGS) $(CONFIG_
 CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
        $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ @PYTHON_LIBS@ \
        $(LIBEXPAT) \
-       $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBCOMMON)
+       $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU)
 CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \
-       $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
-        $(LIBCOMMON)
+       $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU)
 
 ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
 ADD_DEPS = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
@@ -861,6 +854,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
        memattr.o mem-break.o target.o parse.o language.o buildsym.o \
        findcmd.o \
        std-regs.o \
+       signals.o \
        exec.o reverse.o \
        bcache.o objfiles.o observer.o minsyms.o maint.o demangle.o \
        dbxread.o coffread.o coff-pe-read.o \
@@ -903,7 +897,7 @@ CLEANDIRS = $(SUBDIRS) gnulib
 # This is used to force build failures in existing trees when
 # a new directory is added.
 # The format here is for the `case' shell command.
-REQUIRED_SUBDIRS = doc | testsuite | gnulib | data-directory | common
+REQUIRED_SUBDIRS = doc | testsuite | gnulib | data-directory
 
 # For now, shortcut the "configure GDB for fewer languages" stuff.
 YYFILES = c-exp.c \
@@ -1170,26 +1164,6 @@ all-lib: gnulib/Makefile
        @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=gnulib subdir_do
 .PHONY: all-lib
 
-# 
-$(LIBCOMMON): $(LIBCOMMON_DIR)/Makefile
-       @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=common subdir_do
-
-configure-common: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-        test ! -f common/Makefile || exit 0; \
-        $(SHELL) $(srcdir)/../mkinstalldirs common ; \
-        $(HOST_EXPORTS)  \
-        echo Configuring in common; \
-        cd "common" || exit 1; \
-        commondir="$$s/common"; \
-        srcdiroption="--srcdir=$${commondir}"; \
-       $(SHELL) $${commondir}/configure --enable-gdbserver=no \
-          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-          --target=${target_alias} $${srcdiroption}  \
-          || exit 1
-
 # Convenience rule to handle recursion.
 .PHONY: all-data-directory
 all-data-directory: data-directory/Makefile
@@ -1325,13 +1299,6 @@ data-directory/Makefile: data-directory/Makefile.in config.status @frags@
          CONFIG_LINKS= \
          $(SHELL) config.status
 
-common/Makefile: configure-common common/Makefile.in config.status @frags@
-        CONFIG_FILES="common/Makefile" \
-          CONFIG_COMMANDS="depfiles" \
-          CONFIG_HEADERS= \
-          CONFIG_LINKS= \
-          $(SHELL) config.status
-
 config.h: stamp-h ; @true
 stamp-h: $(srcdir)/config.in config.status
        CONFIG_HEADERS=config.h:config.in \
@@ -1353,7 +1320,6 @@ aclocal_m4_deps = \
        gnulib/m4/include_next.m4 \
        gnulib/m4/longlong.m4 \
        gnulib/m4/memchr.m4 \
-       gnulib/m4/memcmp.m4 \
        gnulib/m4/memmem.m4 \
        gnulib/m4/onceonly_2_57.m4 \
        gnulib/m4/stdint.m4 \
@@ -1936,6 +1902,15 @@ mi-common.o: $(srcdir)/mi/mi-common.c
        $(COMPILE) $(srcdir)/mi/mi-common.c
        $(POSTCOMPILE)
 
+# gdb/common/ dependencies
+#
+# Need to explicitly specify the compile rule as make will do nothing
+# or try to compile the object file into the sub-directory.
+
+signals.o: $(srcdir)/common/signals.c
+       $(COMPILE) $(srcdir)/common/signals.c
+       $(POSTCOMPILE)
+
 #
 # gdb/tui/ dependencies
 #