SHELL = /bin/sh
EXEEXT = @EXEEXT@
-PWD_COMMAND = $${PWDCMD-pwd}
-RANLIB = @RANLIB@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
$(srcdir)/linux-xtensa-low.c \
$(srcdir)/win32-arm-low.c $(srcdir)/win32-i386-low.c \
$(srcdir)/win32-low.c $(srcdir)/wincecompat.c \
- $(srcdir)/hostio.c $(srcdir)/hostio-errno.c
+ $(srcdir)/hostio.c $(srcdir)/hostio-errno.c \
+ $(srcdir)/common/common-utils.c $(srcdir)/common/xml-utils.c \
+ $(srcdir)/common/linux-osdata.c $(srcdir)/common/ptid.c \
+ $(srcdir)/common/buffer.c
DEPFILES = @GDBSERVER_DEPFILES@
LIBOBJS = @LIBOBJS@
-LIBCOMMON_DIR = common
-LIBCOMMON = $(LIBCOMMON_DIR)/libcommon.a
-LIBCOMMON_SRC = $(srcdir)/$(LIBCOMMON_DIR)
-
SOURCES = $(SFILES)
TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS}
-OBS = inferiors.o regcache.o remote-utils.o server.o target.o \
+OBS = inferiors.o regcache.o remote-utils.o server.o signals.o target.o \
utils.o version.o \
mem-break.o hostio.o event-loop.o tracepoint.o \
+ xml-utils.o common-utils.o ptid.o buffer.o \
$(XML_BUILTIN) \
$(DEPFILES) $(LIBOBJS)
GDBREPLAY_OBS = gdbreplay.o version.o
all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
-$(LIBCOMMON): $(LIBCOMMON_DIR)/Makefile
- @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=common subdir_do
-
-common/Makefile: configure-common config.status
- CONFIG_FILES="common/Makefile" \
- CONFIG_COMMANDS="depfiles" \
- CONFIG_HEADERS= \
- CONFIG_LINKS= \
- $(SHELL) config.status
-
-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=yes \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- || exit 1
-
# Traditionally "install" depends on "all". But it may be useful
# not to; for example, if the user has made some trivial change to a
# source file and doesn't care about rebuilding or just wants to save the
install-html:
clean-info:
-gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBCOMMON)
+gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS}
rm -f gdbserver$(EXEEXT)
${CC-LD} $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbserver$(EXEEXT) $(OBS) \
- $(LIBCOMMON) $(GDBSERVER_LIBS) $(XM_CLIBS)
+ $(GDBSERVER_LIBS) $(XM_CLIBS)
gdbreplay$(EXEEXT): $(GDBREPLAY_OBS)
rm -f gdbreplay$(EXEEXT)
${CC-LD} $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) \
$(XM_CLIBS)
-IPA_OBJS=tracepoint-ipa.o utils-ipa.o regcache-ipa.o remote-utils-ipa.o ${IPA_DEPFILES}
+IPA_OBJS=tracepoint-ipa.o utils-ipa.o regcache-ipa.o remote-utils-ipa.o common-utils-ipa.o ${IPA_DEPFILES}
IPA_LIB=libinproctrace.so
regcache_h = $(srcdir)/regcache.h
signals_def = $(srcdir)/../../include/gdb/signals.def
signals_h = $(srcdir)/../../include/gdb/signals.h $(signals_def)
+ptid_h = $(srcdir)/../common/ptid.h
+linux_osdata_h = $(srcdir)/../common/linux-osdata.h
server_h = $(srcdir)/server.h $(regcache_h) config.h $(srcdir)/target.h \
$(srcdir)/mem-break.h $(srcdir)/../common/gdb_signals.h \
+ $(srcdir)/../common/common-utils.h \
+ $(srcdir)/../common/xml-utils.h \
+ $(srcdir)/../common/buffer.h \
+ $(srcdir)/../common/gdb_assert.h \
+ $(srcdir)/../common/gdb_locale.h \
+ $(ptid_h) \
$(signals_h)
linux_low_h = $(srcdir)/linux-low.h
+linux_ptrace_h = $(srcdir)/../common/linux-ptrace.h
+
+gdb_thread_db_h = $(srcdir)/../common/gdb_thread_db.h
+
lynx_low_h = $(srcdir)/lynx-low.h $(srcdir)/server.h
nto_low_h = $(srcdir)/nto-low.h
$(CC) -c $(IPAGENT_CFLAGS) $< -o tracepoint-ipa.o
utils-ipa.o: utils.c $(server_h)
$(CC) -c $(IPAGENT_CFLAGS) $< -o utils-ipa.o
+common-utils-ipa.o: ../common/common-utils.c $(server_h)
+ $(CC) -c $(IPAGENT_CFLAGS) $< -o common-utils-ipa.o
remote-utils-ipa.o: remote-utils.c $(server_h)
$(CC) -c $(IPAGENT_CFLAGS) $< -o remote-utils-ipa.o
regcache-ipa.o: regcache.c $(server_h)
remote-utils.o: remote-utils.c terminal.h $(server_h)
server.o: server.c $(server_h)
target.o: target.c $(server_h)
-thread-db.o: thread-db.c $(server_h) $(linux_low_h) $(gdb_proc_service_h)
+thread-db.o: thread-db.c $(server_h) $(linux_low_h) $(gdb_proc_service_h) \
+ $(gdb_thread_db_h)
tracepoint.o: tracepoint.c $(server_h) $(srcdir)/../common/ax.def
utils.o: utils.c $(server_h)
gdbreplay.o: gdbreplay.c config.h
+signals.o: ../common/signals.c $(server_h) $(signals_def)
+ $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+
+common-utils.o: ../common/common-utils.c $(server_h)
+ $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+
+xml-utils.o: ../common/xml-utils.c $(server_h)
+ $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+
+linux-osdata.o: ../common/linux-osdata.c $(server_h) $(linux_osdata_h) ../common/gdb_dirent.h
+ $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+
+ptid.o: ../common/ptid.c $(ptid_h)
+ $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+
+buffer.o: ../common/buffer.c $(server_h)
+ $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+
# We build memmem.c without -Werror because this file is not under
# our control. On LynxOS, the compiler generates some warnings
# because str-two-way.h uses a constant (MAX_SIZE) whose definition
i387-fp.o: i387-fp.c $(server_h)
-linux-low.o: linux-low.c $(linux_low_h) $(server_h)
+linux-low.o: linux-low.c $(linux_low_h) $(linux_ptrace_h) $(server_h) $(linux_osdata_h)
$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< @USE_THREAD_DB@
linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) \