diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-06 16:09:32 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-06 16:09:32 -0600 |
| commit | 8877308fb3e7329560bd619168fc696402881a3e (patch) | |
| tree | 1b496e420871484a2168fd93ed42ed4e4f6051fd | |
| parent | 7a022258c1ea30082fedd56251a3205a5ed30487 (diff) | |
| parent | fbef9e6709b9203ec124277a3671dde66451253e (diff) | |
| download | libayatana-indicator-8877308fb3e7329560bd619168fc696402881a3e.tar.gz libayatana-indicator-8877308fb3e7329560bd619168fc696402881a3e.tar.bz2 libayatana-indicator-8877308fb3e7329560bd619168fc696402881a3e.zip | |
Fixing build source path and build a GTK3 loader
| -rw-r--r-- | libindicator/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/Makefile.am | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index ed963d1..a799d8c 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -73,7 +73,7 @@ glib_marshal_prefix = _indicator_object_marshal indicator-object-enum-types.h: s-enum-types-h @true s-enum-types-h: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template \ $(indicator_headers) ) >> tmp-indicator-object-enum-types.h \ && (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h ) \ && rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F) @@ -81,7 +81,7 @@ s-enum-types-h: $(indicator_headers) indicator-object-enum-types.c: s-enum-types-c @true s-enum-types-c: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template \ $(indicator_headers) ) > tmp-indicator-object-enum-types.c \ && (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c ) \ && rm -f tmp-indicator-object-enum-types.c diff --git a/tools/Makefile.am b/tools/Makefile.am index 6c67491..287d34f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,11 +1,13 @@ if USE_GTK3 INDICATOR_LIB = -lindicator3 +libexec_PROGRAMS = indicator-loader3 +VER=3 else +VER= INDICATOR_LIB = -lindicator +libexec_PROGRAMS = indicator-loader endif -libexec_PROGRAMS = \ - indicator-loader ############################# # Indicator Loader @@ -24,6 +26,14 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ $(INDICATOR_LIB) +# We duplicate these here because Automake won't let us use $(VER) on the left hand side. +# Since we carefully use $(VER) in the right hand side above, we can assign the same values. +# Only one version of the library is every compiled at the same time, so it is safe to reuse +# the right hand sides like this. +indicator_loader3_SOURCES = $(indicator_loader_SOURCES) +indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) +indicator_loader3_LDADD = $(indicator_loader_LDADD) + xsessiondir = $(sysconfdir)/X11/Xsession.d xsession_DATA = 80indicator-debugging |