diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-02 16:49:42 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-02 16:49:42 -0600 |
| commit | 6e2c63951469dff55d6e6236f61bed7c44413459 (patch) | |
| tree | 7f92d68314959da0c938a988a3db06dde0c139c0 | |
| parent | 7c3589d667e07d776b8a470bf52a68868aaec182 (diff) | |
| download | ayatana-indicator-application-6e2c63951469dff55d6e6236f61bed7c44413459.tar.gz ayatana-indicator-application-6e2c63951469dff55d6e6236f61bed7c44413459.tar.bz2 ayatana-indicator-application-6e2c63951469dff55d6e6236f61bed7c44413459.zip | |
Linking to the install directory of libappindicator for the header files
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 2 | ||||
| -rw-r--r-- | src/generate-id.h | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 85e0f66..f7506d1 100644 --- a/configure.ac +++ b/configure.ac @@ -46,11 +46,16 @@ AC_SUBST(INDICATOR_LIBS) LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9 -PKG_CHECK_MODULES(TEST, libappindicator >= $LIBAPPINDICATOR_REQUIRED_VERSION) +PKG_CHECK_MODULES(TEST, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) AC_SUBST(TEST_CFLAGS) AC_SUBST(TEST_LIBS) +APP_INDICATOR_INCLUDE_BASE=`$PKG_CONFIG --variable=includedir appindicator-0.1` +APP_INDICATOR_INCLUDE="$APP_INDICATOR_INCLUDE_BASE/libappindicator-0.1/" + +AC_SUBST(APP_INDICATOR_INCLUDE) + ########################### # Check to see if we're local ########################### diff --git a/src/Makefile.am b/src/Makefile.am index 27ddc10..e461599 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,20 +54,20 @@ indicator_application_service_SOURCES = \ indicator_application_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ + -I$(APP_INDICATOR_INCLUDE) \ -DDATADIR="\"$(pkgdatadir)\"" \ -Wall -Werror \ -DG_LOG_DOMAIN=\"indicator-application-service\" indicator_application_service_LDADD = \ - $(INDICATOR_LIBS) \ - libappindicator.la + $(INDICATOR_LIBS) glib_marshal_list = application-service-marshal.list glib_marshal_prefix = _application_service_marshal glib_enum_h = app-indicator-enum-types.h glib_enum_c = app-indicator-enum-types.c -glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers)) +glib_enum_headers = $(wildcard $(APP_INDICATOR_INCLUDE)/libappindicator/*.h) DISTCLEANFILES += app-indicator-enum-types.c diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index e3befff..6e05739 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -25,7 +25,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #endif #include <dbus/dbus-glib.h> -#include "app-indicator.h" +#include "libappindicator/app-indicator.h" #include "app-indicator-enum-types.h" #include "application-service-appstore.h" #include "application-service-marshal.h" diff --git a/src/generate-id.h b/src/generate-id.h index 9d3167d..4c26da2 100644 --- a/src/generate-id.h +++ b/src/generate-id.h @@ -23,7 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define __GENERATE_ID_H__ #include <glib.h> -#include "app-indicator.h" +#include "libappindicator/app-indicator.h" guint32 generate_id (const AppIndicatorCategory category, const gchar * id); |