aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorCody Russell <crussell@canonical.com>2009-12-11 10:46:30 -0600
committerCody Russell <crussell@canonical.com>2009-12-11 10:46:30 -0600
commit8de275389c7b33fc682da05432738a6730d67f6e (patch)
tree0ddceaeb3f6219f49b9b77334d4c75a1788f324e /src/Makefile.am
parent5fe114ea67dd850e36c7903ea5a6c28d693f3dc3 (diff)
parentd3038937c5f5621da42952a026c61e1f5f74e83a (diff)
downloadayatana-indicator-application-8de275389c7b33fc682da05432738a6730d67f6e.tar.gz
ayatana-indicator-application-8de275389c7b33fc682da05432738a6730d67f6e.tar.bz2
ayatana-indicator-application-8de275389c7b33fc682da05432738a6730d67f6e.zip
trunk merge, resolve conflicts
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c19d91..ee4b7a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
CLEANFILES =
DISTCLEANFILES =
BUILT_SOURCES =
-EXTRA_DIST =
+EXTRA_DIST = libappindicator/appindicator-0.1.pc.in
include $(top_srcdir)/Makefile.am.enum
include $(top_srcdir)/Makefile.am.marshal
@@ -57,6 +57,9 @@ glib_marshal_prefix = _application_service_marshal
# Library
##################################
+pkgconfig_DATA = libappindicator/appindicator-0.1.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
glib_enum_h = libappindicator/app-indicator-enum-types.h
glib_enum_c = libappindicator/app-indicator-enum-types.c
glib_enum_headers = $(libappindicator_headers)