X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=ac4814cfe13caacfa2478c3e89ebe99403c9c571;hb=5f53ea07c7ebe72b36abd41a297ffa49e79adbc0;hp=144d48af4819e826656eb3a7374d7ae8c55d1e04;hpb=f3d64b7c741677cd28e2a11deed67196cd02b46a;p=src%2Fapp-framework-main.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 144d48a..ac4814c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,13 @@
-bin_PROGRAMS = wgtpkg-install wgtpkg-pack wgtpkg-sign wgtpkg-info appfwk
+bin_PROGRAMS = \
+	wgtpkg-installer \
+	wgtpkg-pack \
+	wgtpkg-sign \
+	wgtpkg-info \
+	af-usrd
 
 OTHERSRCS = \
+	utils-dir.c \
+	utils-jbus.c \
 	verbose.c
 
 WGTPKGSRCS = \
@@ -8,6 +15,8 @@ WGTPKGSRCS = \
 	wgtpkg-certs.c \
 	wgtpkg-digsig.c \
 	wgtpkg-files.c \
+	wgtpkg-install.c \
+	wgtpkg-permissions.c \
 	wgtpkg-workdir.c \
 	wgtpkg-xmlsec.c \
 	wgtpkg-zip.c
@@ -21,23 +30,58 @@ SECWRP = \
 	secmgr-wrap.c
 
 APPFWK = \
-	appfwk.c
+	appfwk.c \
+	appfwk-run.c
+
 
 AM_CFLAGS  = -Wall -Wno-pointer-sign
 AM_CFLAGS += -ffunction-sections -fdata-sections
-AM_CFLAGS += ${ZIP_CFLAGS} ${XML2_CFLAGS} ${OPENSSL_CFLAGS} ${XMLSEC_CFLAGS}
+
+fwk_name = aglfwk
+fwk_confdir = $(sysconfdir)/$(fwk_name)
+fwk_datadir = $(datadir)/$(fwk_name)
+fwk_appdir = $(fwk_datadir)/applications
+fwk_icondir = $(fwk_datadir)/icons
+fwk_prefix = urn:agl:
+fwk_prefix_permission = $(fwk_prefix)perm:
+fwk_prefix_plugin = $(fwk_prefix)plugin:
+
+AM_CFLAGS += -DFWK_CONFIG_DIR=\"$(fwk_confdir)\"
+AM_CFLAGS += -DFWK_PREFIX_PERMISSION=\"$(fwk_prefix_permission)\"
+AM_CFLAGS += -DFWK_PREFIX_PLUGIN=\"$(fwk_prefix_plugin)\"
+AM_CFLAGS += -DFWK_ICON_DIR=\"$(fwk_icondir)\"
+AM_CFLAGS += -DFWK_APP_DIR=\"$(fwk_appdir)\"
 
 AM_LDFLAGS = -Wl,--gc-sections
 
-LDADD = ${ZIP_LIBS} ${XML2_LIBS} ${OPENSSL_LIBS} ${XMLSEC_LIBS}
+AM_CFLAGS += \
+	${DBUS_CFLAGS} \
+	${JSON_CFLAGS} \
+	${OPENSSL_CFLAGS} \
+	${XML2_CFLAGS} \
+	${XMLSEC_CFLAGS} \
+	${ZIP_CFLAGS}
+
+LDADD = \
+	${DBUS_LIBS} \
+	${JSON_LIBS} \
+	${OPENSSL_LIBS} \
+	${XML2_LIBS} \
+	${XMLSEC_LIBS} \
+	${ZIP_LIBS}
+
+# remove (or comment) following line to really use simulated components
+AM_CFLAGS += -Isimulation
+
 
 wgtpkg_sign_SOURCES = wgtpkg-sign.c ${WGTPKGSRCS} ${OTHERSRCS}
 
 wgtpkg_pack_SOURCES = wgtpkg-pack.c ${WGTPKGSRCS} ${OTHERSRCS}
 
-wgtpkg_install_SOURCES = wgtpkg-install.c ${WGTPKGSRCS} ${WGTSRCS} ${SECWRP} ${OTHERSRCS}
+wgtpkg_installer_SOURCES = wgtpkg-installer.c ${WGTPKGSRCS} ${WGTSRCS} ${SECWRP} ${OTHERSRCS}
 
 wgtpkg_info_SOURCES = wgtpkg-info.c ${WGTPKGSRCS} ${WGTSRCS} ${OTHERSRCS}
 
-appfwk_SOURCES = ${APPFWK} ${OTHERSRCS}
+af_usrd_SOURCES = af-usrd.c ${APPFWK} ${WGTSRCS} ${OTHERSRCS}
+