From cb225a121648738ca0629c58cbcb925401de73dd Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 13 Feb 2013 19:32:27 +0100 Subject: [PATCH] Adaptation to Timer::Session change --- demo/lib/mk/scout_widgets.mk | 2 +- libports/run/moon.run | 1 + os/lib/mk/dde_kit.mk | 2 +- os/lib/mk/timed_semaphore.mk | 2 +- os/src/drivers/framebuffer/omap4/target.mk | 2 +- os/src/test/alarm/target.mk | 2 +- os/src/test/bomb/target.mk | 2 +- os/src/test/chroot_loader/target.mk | 2 +- os/src/test/dynamic_config/loader/target.mk | 2 +- os/src/test/input/target.mk | 2 +- os/src/test/thread_join/target.mk | 2 +- os/src/test/timer_accuracy/target.mk | 2 +- 12 files changed, 12 insertions(+), 11 deletions(-) diff --git a/demo/lib/mk/scout_widgets.mk b/demo/lib/mk/scout_widgets.mk index cd54fd6fe..4863926ab 100644 --- a/demo/lib/mk/scout_widgets.mk +++ b/demo/lib/mk/scout_widgets.mk @@ -1,4 +1,4 @@ -LIBS = cxx env ipc server blit +LIBS = cxx env ipc server blit signal SRC_CC = sky_texture.cc startup.cc \ elements.cc widgets.cc \ diff --git a/libports/run/moon.run b/libports/run/moon.run index 4f5267c8b..7e05d5d5e 100644 --- a/libports/run/moon.run +++ b/libports/run/moon.run @@ -17,6 +17,7 @@ install_config { + diff --git a/os/lib/mk/dde_kit.mk b/os/lib/mk/dde_kit.mk index 284ddf99f..e449c08f1 100644 --- a/os/lib/mk/dde_kit.mk +++ b/os/lib/mk/dde_kit.mk @@ -1,7 +1,7 @@ SRC_C = lock.cc semaphore.cc panic.cc printf.cc interrupt.cc pgtab.cc \ memory.cc thread.cc pci_tree.cc pci.cc resources.cc timer.cc \ dde_kit.cc spin_lock.cc -LIBS = thread alarm lock +LIBS = thread alarm lock signal # # Enable 'spin_lock.cc' to reuse the spinlock implementation of the base diff --git a/os/lib/mk/timed_semaphore.mk b/os/lib/mk/timed_semaphore.mk index a6ee604be..6cc27d786 100644 --- a/os/lib/mk/timed_semaphore.mk +++ b/os/lib/mk/timed_semaphore.mk @@ -1,4 +1,4 @@ SRC_CC = timed_semaphore.cc -LIBS = thread alarm +LIBS = thread alarm signal vpath timed_semaphore.cc $(REP_DIR)/src/lib/timed_semaphore diff --git a/os/src/drivers/framebuffer/omap4/target.mk b/os/src/drivers/framebuffer/omap4/target.mk index 378aa2c82..8334c1a17 100644 --- a/os/src/drivers/framebuffer/omap4/target.mk +++ b/os/src/drivers/framebuffer/omap4/target.mk @@ -7,7 +7,7 @@ TARGET = omap4_fb_drv REQUIRES = omap4 SRC_CC = main.cc -LIBS = cxx env server +LIBS = cxx env server signal INC_DIR += $(PRG_DIR) vpath main.cc $(PRG_DIR) diff --git a/os/src/test/alarm/target.mk b/os/src/test/alarm/target.mk index 3171a2534..c63dedd44 100644 --- a/os/src/test/alarm/target.mk +++ b/os/src/test/alarm/target.mk @@ -1,3 +1,3 @@ TARGET = test-alarm -LIBS = cxx env thread alarm +LIBS = cxx env thread alarm signal SRC_CC = main.cc diff --git a/os/src/test/bomb/target.mk b/os/src/test/bomb/target.mk index 0e8b3c97e..284d910d8 100644 --- a/os/src/test/bomb/target.mk +++ b/os/src/test/bomb/target.mk @@ -1,3 +1,3 @@ TARGET = bomb -LIBS = cxx env thread child server +LIBS = cxx env thread child server signal SRC_CC = main.cc diff --git a/os/src/test/chroot_loader/target.mk b/os/src/test/chroot_loader/target.mk index 0c2900720..cf7798f97 100644 --- a/os/src/test/chroot_loader/target.mk +++ b/os/src/test/chroot_loader/target.mk @@ -1,4 +1,4 @@ TARGET = test-chroot_loader REQUIRES += linux SRC_CC = main.cc -LIBS += cxx env +LIBS += cxx env signal diff --git a/os/src/test/dynamic_config/loader/target.mk b/os/src/test/dynamic_config/loader/target.mk index 590d77313..5ae37307f 100644 --- a/os/src/test/dynamic_config/loader/target.mk +++ b/os/src/test/dynamic_config/loader/target.mk @@ -1,3 +1,3 @@ TARGET = test-dynamic_config_loader SRC_CC = main.cc -LIBS = env +LIBS = env signal diff --git a/os/src/test/input/target.mk b/os/src/test/input/target.mk index 5b24b8243..71af820da 100644 --- a/os/src/test/input/target.mk +++ b/os/src/test/input/target.mk @@ -1,3 +1,3 @@ TARGET = test-input SRC_CC = test.cc -LIBS = cxx env +LIBS = cxx env signal diff --git a/os/src/test/thread_join/target.mk b/os/src/test/thread_join/target.mk index b0f752506..18fbdacec 100644 --- a/os/src/test/thread_join/target.mk +++ b/os/src/test/thread_join/target.mk @@ -1,3 +1,3 @@ TARGET = test-thread_join SRC_CC = main.cc -LIBS = cxx env thread +LIBS = cxx env thread signal diff --git a/os/src/test/timer_accuracy/target.mk b/os/src/test/timer_accuracy/target.mk index 70062213c..cfd373221 100644 --- a/os/src/test/timer_accuracy/target.mk +++ b/os/src/test/timer_accuracy/target.mk @@ -1,4 +1,4 @@ TARGET = test-timer_accuracy REQUIRES = linux SRC_CC = main.cc -LIBS = env cxx syscall +LIBS = env cxx syscall signal