From e5b241588b3d608d89a5734da83daff8d99c2a36 Mon Sep 17 00:00:00 2001 From: Matous Pokorny Date: Mon, 2 Jul 2012 17:07:45 +0200 Subject: [PATCH] pathplan: map2png is compiled as static library, not as source file of the application --- src/pathplan/Makefile.omk | 10 +++++----- src/pathplan/test/Makefile.omk | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/pathplan/Makefile.omk b/src/pathplan/Makefile.omk index 9040babd..b82c8b56 100644 --- a/src/pathplan/Makefile.omk +++ b/src/pathplan/Makefile.omk @@ -6,16 +6,16 @@ map_SOURCES = map.c include_HEADERS += map.h # Map to PNG file Library -#lib_LIBRARIES += map_2_png -#map_2_png_SOURCES = map_2_png.c -#include_HEADERS += map_2_png.h +lib_LIBRARIES += map_2_png +map_2_png_SOURCES = map_2_png.c +include_HEADERS += map_2_png.h INCLUDES += $(shell pkg-config --cflags libpng) # Path Plan library lib_LIBRARIES += pathplan -pathplan_SOURCES = path_planner.c aalgorithm.c pathqueue.c path_simplifier.c map_2_png.c -include_HEADERS += aalgorithm.h pathqueue.h path_simplifier.h path_planner.h map_2_png.h +pathplan_SOURCES = path_planner.c aalgorithm.c pathqueue.c path_simplifier.c +include_HEADERS += aalgorithm.h pathqueue.h path_simplifier.h path_planner.h SUBDIRS = test diff --git a/src/pathplan/test/Makefile.omk b/src/pathplan/test/Makefile.omk index b4690e5a..f92a6107 100644 --- a/src/pathplan/test/Makefile.omk +++ b/src/pathplan/test/Makefile.omk @@ -6,13 +6,20 @@ testmap_LIBS = map m test_PROGRAMS += testpathplan testpathplan_SOURCES = testpathplan.c -testpathplan_LIBS = pathplan rt map m rbtree shist +testpathplan_LIBS = pathplan rt map m rbtree shist map_2_png test_PROGRAMS += testastar testastar_SOURCES = testastar.c -testastar_LIBS = pathplan map m +testastar_LIBS = pathplan map m map_2_png + +test_PROGRAMS += testmap_2_png +testmap_2_png_SOURCES = testmap_2_png.c +testmap_2_png_LIBS = pathplan map m map_2_png + +test_PROGRAMS += testmasks +testmasks_SOURCES = testmasks.c +testmasks_LIBS = pathplan map m map_2_png + +lib_LOADLIBES += png -test_PROGRAMS += testbitmaps -testbitmaps_SOURCES = testbitmaps.c -testbitmaps_LIBS = pathplan map m -- 2.39.2