Attachment #594242 for bug #698774

Lines 57-63 libindicator_la_CFLAGS = \ Link Here

(-)a/libindicator/Makefile.am (-1 / +1 lines)
57	$(LIBINDICATOR_CFLAGS) \	57	$(LIBINDICATOR_CFLAGS) \
58	$(COVERAGE_CFLAGS) \	58	$(COVERAGE_CFLAGS) \
59	-DG_LOG_DOMAIN=\"libindicator\" \	59	-DG_LOG_DOMAIN=\"libindicator\" \
60	-Wall -Werror	60	-Wall -Wno-error
61		61
62	libindicator_la_LIBADD = \	62	libindicator_la_LIBADD = \
63	$(LIBINDICATOR_LIBS)	63	$(LIBINDICATOR_LIBS)




top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@USE_GTK3_FALSE@VER =
@USE_GTK3_TRUE@VER = 3
@USE_GTK3_FALSE@lib_LTLIBRARIES = libindicator.la
@USE_GTK3_TRUE@lib_LTLIBRARIES = libindicator3.la

	$(LIBINDICATOR_CFLAGS) \
	$(COVERAGE_CFLAGS) \
	-DG_LOG_DOMAIN=\"libindicator\" \
	-Wall -Wno-error

libindicator_la_LIBADD = \
	$(LIBINDICATOR_LIBS)

	  echo "rm -f \"$${dir}/so_locations\""; \
	  rm -f "$${dir}/so_locations"; \
	done
libindicator.la: $(libindicator_la_OBJECTS) $(libindicator_la_DEPENDENCIES) $(EXTRA_libindicator_la_DEPENDENCIES)
	$(AM_V_CCLD)$(libindicator_la_LINK) $(am_libindicator_la_rpath) $(libindicator_la_OBJECTS) $(libindicator_la_LIBADD) $(LIBS)
libindicator3.la: $(libindicator3_la_OBJECTS) $(libindicator3_la_DEPENDENCIES) $(EXTRA_libindicator3_la_DEPENDENCIES)
	$(AM_V_CCLD)$(libindicator3_la_LINK) $(am_libindicator3_la_rpath) $(libindicator3_la_OBJECTS) $(libindicator3_la_LIBADD) $(LIBS)

mostlyclean-compile:

Lines 17-23 indicator_loader_SOURCES = \ Link Here

(-)a/tools/Makefile.am (-1 / +1 lines)
17	indicator-loader.c	17	indicator-loader.c
18		18
19	indicator_loader_CFLAGS = \	19	indicator_loader_CFLAGS = \
20	-Wall -Werror \	20	-Wall -Wno-error \
21	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \	21	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
22	-DBUILD_DIR="\"$(builddir)\""	22	-DBUILD_DIR="\"$(builddir)\""
23		23




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.c

indicator_loader_CFLAGS = \
	-Wall -Wno-error \
	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
	-DBUILD_DIR="\"$(builddir)\""


	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
	echo " rm -f" $$list; \
	rm -f $$list
indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES) $(EXTRA_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) $(EXTRA_indicator_loader3_DEPENDENCIES)
	@rm -f indicator-loader3$(EXEEXT)
	$(AM_V_CCLD)$(indicator_loader3_LINK) $(indicator_loader3_OBJECTS) $(indicator_loader3_LDADD) $(LIBS)


Return to bug 698774

Lines 330-336 target_alias = @target_alias@ Link Here

(-)a/libindicator/Makefile.in (-4 / +4 lines)
330	top_build_prefix = @top_build_prefix@	330	top_build_prefix = @top_build_prefix@
331	top_builddir = @top_builddir@	331	top_builddir = @top_builddir@
332	top_srcdir = @top_srcdir@	332	top_srcdir = @top_srcdir@
333	@USE_GTK3_FALSE@VER =	333	@USE_GTK3_FALSE@VER =
334	@USE_GTK3_TRUE@VER = 3	334	@USE_GTK3_TRUE@VER = 3
335	@USE_GTK3_FALSE@lib_LTLIBRARIES = libindicator.la	335	@USE_GTK3_FALSE@lib_LTLIBRARIES = libindicator.la
336	@USE_GTK3_TRUE@lib_LTLIBRARIES = libindicator3.la	336	@USE_GTK3_TRUE@lib_LTLIBRARIES = libindicator3.la
Lines 380-386 libindicator_la_CFLAGS = \ Link Here
380	$(LIBINDICATOR_CFLAGS) \	380	$(LIBINDICATOR_CFLAGS) \
381	$(COVERAGE_CFLAGS) \	381	$(COVERAGE_CFLAGS) \
382	-DG_LOG_DOMAIN=\"libindicator\" \	382	-DG_LOG_DOMAIN=\"libindicator\" \
383	-Wall -Werror	383	-Wall -Wno-error
384		384
385	libindicator_la_LIBADD = \	385	libindicator_la_LIBADD = \
386	$(LIBINDICATOR_LIBS)	386	$(LIBINDICATOR_LIBS)
Lines 485-493 clean-libLTLIBRARIES: Link Here
485	echo "rm -f \"$${dir}/so_locations\""; \	485	echo "rm -f \"$${dir}/so_locations\""; \
486	rm -f "$${dir}/so_locations"; \	486	rm -f "$${dir}/so_locations"; \
487	done	487	done
488	libindicator.la: $(libindicator_la_OBJECTS) $(libindicator_la_DEPENDENCIES) $(EXTRA_libindicator_la_DEPENDENCIES)	488	libindicator.la: $(libindicator_la_OBJECTS) $(libindicator_la_DEPENDENCIES) $(EXTRA_libindicator_la_DEPENDENCIES)
489	$(AM_V_CCLD)$(libindicator_la_LINK) $(am_libindicator_la_rpath) $(libindicator_la_OBJECTS) $(libindicator_la_LIBADD) $(LIBS)	489	$(AM_V_CCLD)$(libindicator_la_LINK) $(am_libindicator_la_rpath) $(libindicator_la_OBJECTS) $(libindicator_la_LIBADD) $(LIBS)
490	libindicator3.la: $(libindicator3_la_OBJECTS) $(libindicator3_la_DEPENDENCIES) $(EXTRA_libindicator3_la_DEPENDENCIES)	490	libindicator3.la: $(libindicator3_la_OBJECTS) $(libindicator3_la_DEPENDENCIES) $(EXTRA_libindicator3_la_DEPENDENCIES)
491	$(AM_V_CCLD)$(libindicator3_la_LINK) $(am_libindicator3_la_rpath) $(libindicator3_la_OBJECTS) $(libindicator3_la_LIBADD) $(LIBS)	491	$(AM_V_CCLD)$(libindicator3_la_LINK) $(am_libindicator3_la_rpath) $(libindicator3_la_OBJECTS) $(libindicator3_la_LIBADD) $(LIBS)
492		492
493	mostlyclean-compile:	493	mostlyclean-compile:

Lines 293-299 top_builddir = @top_builddir@ Link Here

(-)a/tools/Makefile.in (-4 / +4 lines)
293	top_srcdir = @top_srcdir@	293	top_srcdir = @top_srcdir@
294	@USE_GTK3_FALSE@INDICATOR_LIB = -lindicator	294	@USE_GTK3_FALSE@INDICATOR_LIB = -lindicator
295	@USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3	295	@USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3
296	@USE_GTK3_FALSE@VER =	296	@USE_GTK3_FALSE@VER =
297	@USE_GTK3_TRUE@VER = 3	297	@USE_GTK3_TRUE@VER = 3
298		298
299	#############################	299	#############################
Lines 303-309 indicator_loader_SOURCES = \ Link Here
303	indicator-loader.c	303	indicator-loader.c
304		304
305	indicator_loader_CFLAGS = \	305	indicator_loader_CFLAGS = \
306	-Wall -Werror \	306	-Wall -Wno-error \
307	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \	307	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
308	-DBUILD_DIR="\"$(builddir)\""	308	-DBUILD_DIR="\"$(builddir)\""
309		309
Lines 403-412 clean-libexecPROGRAMS: Link Here
403	list=`for p in $$list; do echo "$$p"; done \| sed 's/$(EXEEXT)$$//'`; \	403	list=`for p in $$list; do echo "$$p"; done \| sed 's/$(EXEEXT)$$//'`; \
404	echo " rm -f" $$list; \	404	echo " rm -f" $$list; \
405	rm -f $$list	405	rm -f $$list
406	indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES) $(EXTRA_indicator_loader_DEPENDENCIES)	406	indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES) $(EXTRA_indicator_loader_DEPENDENCIES)
407	@rm -f indicator-loader$(EXEEXT)	407	@rm -f indicator-loader$(EXEEXT)
408	$(AM_V_CCLD)$(indicator_loader_LINK) $(indicator_loader_OBJECTS) $(indicator_loader_LDADD) $(LIBS)	408	$(AM_V_CCLD)$(indicator_loader_LINK) $(indicator_loader_OBJECTS) $(indicator_loader_LDADD) $(LIBS)
409	indicator-loader3$(EXEEXT): $(indicator_loader3_OBJECTS) $(indicator_loader3_DEPENDENCIES) $(EXTRA_indicator_loader3_DEPENDENCIES)	409	indicator-loader3$(EXEEXT): $(indicator_loader3_OBJECTS) $(indicator_loader3_DEPENDENCIES) $(EXTRA_indicator_loader3_DEPENDENCIES)
410	@rm -f indicator-loader3$(EXEEXT)	410	@rm -f indicator-loader3$(EXEEXT)
411	$(AM_V_CCLD)$(indicator_loader3_LINK) $(indicator_loader3_OBJECTS) $(indicator_loader3_LDADD) $(LIBS)	411	$(AM_V_CCLD)$(indicator_loader3_LINK) $(indicator_loader3_OBJECTS) $(indicator_loader3_LDADD) $(LIBS)
412		412