Code Review
/
staging
/
basesystem.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix taskmanager/client/libtskmcfg/Makefile for crossbuild environment
[staging/basesystem.git]
/
service
/
system
/
task_manager
/
client
/
libtskmcfg
/
Makefile
diff --git
a/service/system/task_manager/client/libtskmcfg/Makefile
b/service/system/task_manager/client/libtskmcfg/Makefile
index
a26b6c8
..
1179183
100755
(executable)
--- a/
service/system/task_manager/client/libtskmcfg/Makefile
+++ b/
service/system/task_manager/client/libtskmcfg/Makefile
@@
-23,7
+23,7
@@
INST_HEADERS = tskm_xml_data.h tskm_svcid.h task_manager_libtskmcfg.h
libtskmcfg_SRCS = tskm_xml_data.cpp
libtskmcfg_SRCS = tskm_xml_data.cpp
-CPPFLAGS
= -I./ -I./include -I./../../include-share -I./../../server/include
+CPPFLAGS
+= -I./ -I./include -I./../../include-share -I./../../server/include
LDFLAGS += -Wl,--no-as-needed
LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
LDFLAGS += -Wl,--no-as-needed
LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
@@
-38,11
+38,13
@@
HOST_CPP=cpp
XMLCHECKER=xmllint
XMLCHECKEROPT=--noout --valid
PARSEXMLCMD=parsexml
XMLCHECKER=xmllint
XMLCHECKEROPT=--noout --valid
PARSEXMLCMD=parsexml
-HOSTCC=gcc
+HOSTCC=$(BUILD_CC)
+HOSTCFLAGS=$(BUILD_CFLAGS)
+HOSTLDFLAGS=$(BUILD_LDFLAGS)
XMLFILETOP=tskm_cfg.xml
install:install-pre install-pre-header
XMLFILETOP=tskm_cfg.xml
install:install-pre install-pre-header
-build-lib:install-pre
install-pre
-header
+build-lib:install-pre-header
install-lib:install-pre install-pre-header
install-pre:
install -d -m 775 $(DESTDIR)/etc/basesystem/BS/ss/task_manager/rodata;\
install-lib:install-pre install-pre-header
install-pre:
install -d -m 775 $(DESTDIR)/etc/basesystem/BS/ss/task_manager/rodata;\
@@
-50,8
+52,8
@@
install-pre:
CONFIG_FILES:=tskm_wakeup.xml tskm_shutdown.xml tskm_wakeup_vup.xml tskm_shutdown_vup.xml tskm_launch.xml tskm_svcid.h agl_thread_tm.h
CONFIG_FILES:=tskm_wakeup.xml tskm_shutdown.xml tskm_wakeup_vup.xml tskm_shutdown_vup.xml tskm_launch.xml tskm_svcid.h agl_thread_tm.h
-#install-header:$(XMLOUTFILE)
-install-pre-header:$(XMLOUTFILE)
+#install-header:$(XMLOUTFILE)
+install-pre-header:$(XMLOUTFILE)
#TOPFILE
top.xml:$(XMLFILETOP)
#TOPFILE
top.xml:$(XMLFILETOP)
@@
-80,12
+82,11
@@
agl_thread_tm.h:$(WAKESHUTCONF_DIR)/agl_thread_tm.h
tskm_launch.xml:$(WAKESHUTCONF_DIR)/tskm_launch.xml agl_thread_tm.h
$(HOST_CPP) -P -include agl_thread_tm.h $< > $@
tskm_launch.xml:$(WAKESHUTCONF_DIR)/tskm_launch.xml agl_thread_tm.h
$(HOST_CPP) -P -include agl_thread_tm.h $< > $@
-$(XMLOUTFILE):top.xml $(PARSEXMLCMD) $(CONFIG_FILES)
+$(XMLOUTFILE):top.xml $(PARSEXMLCMD) $(CONFIG_FILES)
$(XMLCHECKER) $(XMLCHECKEROPT) $<
./$(PARSEXMLCMD) $<
$(PARSEXMLCMD):$(PARSEXMLCMD).c
$(XMLCHECKER) $(XMLCHECKEROPT) $<
./$(PARSEXMLCMD) $<
$(PARSEXMLCMD):$(PARSEXMLCMD).c
- $(HOSTCC) -o $@ $< -lexpat
+ $(HOSTCC)
$(HOSTCFLAGS) $(HOSTLDFLAGS)
-o $@ $< -lexpat
include ../../../system_service.mk
include ../../../system_service.mk
-