diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 53 |
1 files changed, 49 insertions, 4 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index f5a77ff..a72c8cb 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -35,11 +35,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -libexec_PROGRAMS = indicator-loader$(EXEEXT) +@USE_GTK3_FALSE@libexec_PROGRAMS = indicator-loader$(EXEEXT) +@USE_GTK3_TRUE@libexec_PROGRAMS = indicator-loader3$(EXEEXT) subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -61,6 +65,15 @@ indicator_loader_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(indicator_loader_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ +am__objects_1 = indicator_loader3-indicator-loader.$(OBJEXT) +am_indicator_loader3_OBJECTS = $(am__objects_1) +indicator_loader3_OBJECTS = $(am_indicator_loader3_OBJECTS) +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +indicator_loader3_DEPENDENCIES = $(am__DEPENDENCIES_2) +indicator_loader3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(indicator_loader3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -87,8 +100,9 @@ am__v_CCLD_0 = @echo " CCLD " $@; AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(indicator_loader_SOURCES) -DIST_SOURCES = $(indicator_loader_SOURCES) +SOURCES = $(indicator_loader_SOURCES) $(indicator_loader3_SOURCES) +DIST_SOURCES = $(indicator_loader_SOURCES) \ + $(indicator_loader3_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -240,6 +254,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @USE_GTK3_FALSE@INDICATOR_LIB = -lindicator @USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3 +@USE_GTK3_FALSE@VER = +@USE_GTK3_TRUE@VER = 3 ############################# # Indicator Loader @@ -250,6 +266,7 @@ indicator_loader_SOURCES = \ indicator_loader_CFLAGS = \ -Wall -Werror \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -Wall -Werror \ -DBUILD_DIR="\"$(builddir)\"" indicator_loader_LDADD = \ @@ -257,6 +274,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 EXTRA_DIST = $(xsession_DATA) @@ -340,6 +365,9 @@ clean-libexecPROGRAMS: indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES) @rm -f indicator-loader$(EXEEXT) $(AM_V_CCLD)$(indicator_loader_LINK) $(indicator_loader_OBJECTS) $(indicator_loader_LDADD) $(LIBS) +indicator-loader3$(EXEEXT): $(indicator_loader3_OBJECTS) $(indicator_loader3_DEPENDENCIES) + @rm -f indicator-loader3$(EXEEXT) + $(AM_V_CCLD)$(indicator_loader3_LINK) $(indicator_loader3_OBJECTS) $(indicator_loader3_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -348,6 +376,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_loader-indicator-loader.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_loader3-indicator-loader.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -389,6 +418,22 @@ indicator_loader-indicator-loader.obj: indicator-loader.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader_CFLAGS) $(CFLAGS) -c -o indicator_loader-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi` +indicator_loader3-indicator-loader.o: indicator-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -MT indicator_loader3-indicator-loader.o -MD -MP -MF $(DEPDIR)/indicator_loader3-indicator-loader.Tpo -c -o indicator_loader3-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_loader3-indicator-loader.Tpo $(DEPDIR)/indicator_loader3-indicator-loader.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-loader.c' object='indicator_loader3-indicator-loader.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -c -o indicator_loader3-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c + +indicator_loader3-indicator-loader.obj: indicator-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -MT indicator_loader3-indicator-loader.obj -MD -MP -MF $(DEPDIR)/indicator_loader3-indicator-loader.Tpo -c -o indicator_loader3-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_loader3-indicator-loader.Tpo $(DEPDIR)/indicator_loader3-indicator-loader.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-loader.c' object='indicator_loader3-indicator-loader.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -c -o indicator_loader3-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi` + mostlyclean-libtool: -rm -f *.lo |