summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-08-01 02:21:26 -0700
committerStefano Karapetsas <[email protected]>2013-08-01 02:21:26 -0700
commit0f9758bfdedfd0c5a67a795f421cfbc2d07f0f6c (patch)
tree535de2c25c9ce09543174644ae8cebf48b6cf032 /src/Makefile.am
parent472e1e834bc1033c1ec8f0f88250460e138fbf35 (diff)
parentac5d3248257e9e1ddbf57ca5828a1de165d445a4 (diff)
downloadengrampa-0f9758bfdedfd0c5a67a795f421cfbc2d07f0f6c.tar.bz2
engrampa-0f9758bfdedfd0c5a67a795f421cfbc2d07f0f6c.tar.xz
Merge pull request #21 from infirit/unarchiver
Add unarchiver support
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f6905c..321a0d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,8 @@ AM_CPPFLAGS = \
-DPRIVEXECDIR=\"$(privexecdir)\" \
-DSHDIR=\"$(shdir)\" \
$(DISABLE_DEPRECATED) \
- $(FR_CFLAGS)
+ $(FR_CFLAGS) \
+ $(JSON_GLIB_CFLAGS)
BUILT_SOURCES = \
fr-marshal.c \
@@ -149,6 +150,12 @@ engrampa_SOURCES = \
$(MKDTEMP_FILES) \
$(BUILT_SOURCES)
+if ENABLE_JSON_GLIB
+engrampa_SOURCES += \
+ fr-command-unarchiver.h \
+ fr-command-unarchiver.c
+endif
+
fr-marshal.h: fr-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)( $(GLIB_GENMARSHAL) $< --header --prefix=fr_marshal > [email protected] )
@@ -179,7 +186,8 @@ fr-enum-types.c: typedefs.h fr-enum-types.h
engrampa_LDADD = \
$(top_builddir)/copy-n-paste/libeggsmclient.la \
- $(FR_LIBS)
+ $(FR_LIBS) \
+ ${JSON_GLIB_LIBS}
EXTRA_DIST = fr-marshal.list