Only query a relation set if it is non-NULL

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / Makefile.am

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 140ede4..4279d76 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -10,8 +10,7 @@ gtkmodule_LTLIBRARIES = libatk-bridge.la
 libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
                          $(ATK_CFLAGS)       \
                          -I$(top_srcdir)     \
-                         -I$(top_srcdir)/atk-adaptor/adaptors \
-                         -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+                         -I$(top_srcdir)/atk-adaptor/adaptors
 
 libatk_bridge_la_LDFLAGS = -no-undefined  \
                           -module        \
@@ -32,6 +31,8 @@ libatk_bridge_la_SOURCES =    \
         accessible-cache.h      \
        accessible-register.c   \
        accessible-register.h   \
+       introspection.c         \
+       introspection.h         \
        bridge.c                \
        bridge.h                \
        object.c                \
@@ -40,13 +41,14 @@ libatk_bridge_la_SOURCES =  \
        event.h
 
 if RELOCATE
-gtkpathdir = $(gtkmoduledir)/..
 gnomeautostartdir = $(datadir)/gnome/autostart
 gnomeautostart_DATA = atk-bridge.desktop
+endif
+
+gtkpathdir = $(gtkmoduledir)/..
 EXTRA_DIST = atk-bridge.desktop.in
-CLEANFILES = $(gnome_autostart_DATA)
+CLEANFILES = atk-bridge.desktop
 
 %.desktop: %.desktop.in Makefile.am
        sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \
        < $< > $@
-endif