1 files changed, 41 insertions, 17 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0826e12..3465049 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,12 @@
-bin_PROGRAMS = wgtpkg-installer wgtpkg-pack wgtpkg-sign wgtpkg-info appfwk
+bin_PROGRAMS = \
+	wgtpkg-installer \
+	wgtpkg-pack \
+	wgtpkg-sign \
+	wgtpkg-info \
+	appfwk
 
 OTHERSRCS = \
+	utils-dir.c \
 	verbose.c
 
 WGTPKGSRCS = \
@@ -26,28 +32,45 @@ APPFWK = \
 	appfwk.c
 
 
-#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} ${JSON_CFLAGS}
-
-AM_CFLAGS += -Isimulation
-
-AM_CFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
-AM_CFLAGS += -DPREFIXPERMISSION=\"urn:agl-perm:\"
-AM_CFLAGS += -DICONDESTDIR=\"$(deficondir)\"
-AM_CFLAGS += -DAPPDEFDIR=\"$(defappdir)\"
 
+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} ${JSON_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}
 
@@ -59,3 +82,4 @@ wgtpkg_info_SOURCES = wgtpkg-info.c ${WGTPKGSRCS} ${WGTSRCS} ${OTHERSRCS}
 
 appfwk_SOURCES = ${APPFWK} ${WGTSRCS} ${OTHERSRCS}
 
+