From fcd67f55198680da8fc124f737fd813187fef6e4 Mon Sep 17 00:00:00 2001 From: jdelange Date: Fri, 2 Dec 2011 17:49:35 +0000 Subject: [PATCH] * src/Makefile.am include/Makefile.am share/make/Makefile.common - Integrate the monitor function in the build system. git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-c@3474 129961e7-ef38-4bb5-a8f7-c9a525a55882 --- include/Makefile.am | 1 + share/make/Makefile.common | 2 ++ src/Makefile.am | 15 ++++++++------- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am index 715d81b..63816f3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -7,6 +7,7 @@ EXTRA_DIST = $(srcdir)/po_hi_common.h \ $(srcdir)/po_hi_protected.h \ $(srcdir)/po_hi_returns.h \ $(srcdir)/po_hi_gqueue.h \ + $(srcdir)/po_hi_monitor.h \ $(srcdir)/po_hi_giop.h \ $(srcdir)/po_hi_utils.h \ $(srcdir)/po_hi_task.h \ diff --git a/share/make/Makefile.common b/share/make/Makefile.common index 3cf5268..a43190c 100644 --- a/share/make/Makefile.common +++ b/share/make/Makefile.common @@ -87,6 +87,7 @@ ifeq ($(NEED_TRANSPORT), yes) po_hi_giop.o \ po_hi_utils.o \ po_hi_types.o \ + po_hi_monitor.o \ po_hi_gqueue.o \ drivers/po_hi_driver_exarm.o \ drivers/po_hi_driver_keyboard.o \ @@ -123,6 +124,7 @@ else po_hi_time.o \ po_hi_utils.o \ po_hi_protected.o \ + po_hi_monitor.o \ po_hi_main.o GENERATED_OBJS = \ diff --git a/src/Makefile.am b/src/Makefile.am index ea51106..0420f89 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,13 +1,14 @@ AUTOMAKE_OPTIONS = no-dependencies SUBDIRS=drivers -C_FILES = $(srcdir)/po_hi_task.c \ - $(srcdir)/po_hi_main.c \ - $(srcdir)/po_hi_marshallers.c \ - $(srcdir)/po_hi_messages.c \ - $(srcdir)/po_hi_gqueue.c \ - $(srcdir)/po_hi_giop.c \ - $(srcdir)/po_hi_protected.c \ +C_FILES = $(srcdir)/po_hi_task.c \ + $(srcdir)/po_hi_main.c \ + $(srcdir)/po_hi_marshallers.c \ + $(srcdir)/po_hi_messages.c \ + $(srcdir)/po_hi_monitor.c \ + $(srcdir)/po_hi_gqueue.c \ + $(srcdir)/po_hi_giop.c \ + $(srcdir)/po_hi_protected.c \ $(srcdir)/po_hi_transport.c \ $(srcdir)/po_hi_types.c \ $(srcdir)/po_hi_utils.c \ -- GitLab