work in progress

[src/app-framework-main.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a538a38..0826e12 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,24 +28,26 @@ APPFWK = \
 
 #pkgsysconfdir = $(sysconfdir)
 pkgsysconfdir = .
-
+#deffwdir = $(datadir)/af
+deffwdir = ./af
+defappdir = $(deffwdir)/applications
+deficondir = $(deffwdir)/icons
 
 AM_CFLAGS  = -Wall -Wno-pointer-sign
 AM_CFLAGS += -ffunction-sections -fdata-sections
-AM_CFLAGS += ${ZIP_CFLAGS} ${XML2_CFLAGS} ${OPENSSL_CFLAGS} ${XMLSEC_CFLAGS}
-
-
+AM_CFLAGS += ${ZIP_CFLAGS} ${XML2_CFLAGS} ${OPENSSL_CFLAGS} ${XMLSEC_CFLAGS} ${JSON_CFLAGS}
 
+AM_CFLAGS += -Isimulation
 
 AM_CFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 AM_CFLAGS += -DPREFIXPERMISSION=\"urn:agl-perm:\"
-AM_CFLAGS += -DICONDESTDIR=\"\"
-
+AM_CFLAGS += -DICONDESTDIR=\"$(deficondir)\"
+AM_CFLAGS += -DAPPDEFDIR=\"$(defappdir)\"
 
 
 AM_LDFLAGS = -Wl,--gc-sections
 
-LDADD = ${ZIP_LIBS} ${XML2_LIBS} ${OPENSSL_LIBS} ${XMLSEC_LIBS}
+LDADD = ${ZIP_LIBS} ${XML2_LIBS} ${OPENSSL_LIBS} ${XMLSEC_LIBS} ${JSON_LIBS}
 
 wgtpkg_sign_SOURCES = wgtpkg-sign.c ${WGTPKGSRCS} ${OTHERSRCS}
 
@@ -55,5 +57,5 @@ wgtpkg_installer_SOURCES = wgtpkg-installer.c ${WGTPKGSRCS} ${WGTSRCS} ${SECWRP}
 
 wgtpkg_info_SOURCES = wgtpkg-info.c ${WGTPKGSRCS} ${WGTSRCS} ${OTHERSRCS}
 
-appfwk_SOURCES = ${APPFWK} ${OTHERSRCS}
+appfwk_SOURCES = ${APPFWK} ${WGTSRCS} ${OTHERSRCS}