Commit ae6be22c authored by Vincent Untz's avatar Vincent Untz
Browse files

build: Update all Makefile.am to more recent standards

parent 996efbd1
SUBDIRS = \
po \
icons \
gnome-panel \
libpanel-applet \
applets \
help \
doc \
man
help \
icons \
man \
po
if HAVE_BONOBO
SUBDIRS += bonobo
......@@ -14,6 +14,8 @@ endif
ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-scrollkeeper
EXTRA_DIST = \
COPYING-DOCS \
HACKING \
......@@ -21,8 +23,6 @@ EXTRA_DIST = \
ChangeLog.pre-git \
gnome-doc-utils.make
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper --enable-introspection
DISTCLEANFILES = \
gnome-doc-utils.make
......
SUBDIRS = \
clock \
fish \
notification_area \
SUBDIRS = \
clock \
fish \
notification_area \
wncklet
# Remove any old gen_util .server files lying around.
gen_util_server = $(libdir)/bonobo/servers/GNOME_GenUtilApplet_Factory.server
install-data-local:
if test -f $(DESTDIR)$(gen_util_server); then \
rm -f $(DESTDIR)$(gen_util_server); \
fi
-include $(top_srcdir)/git.mk
SUBDIRS = pixmaps
INCLUDES = \
noinst_LTLIBRARIES = libsystem-timezone.la
noinst_PROGRAMS = test-system-timezone
AM_CPPFLAGS = \
$(LIBPANEL_APPLET_CFLAGS) \
$(CLOCK_CFLAGS) \
-I$(srcdir)/../../libpanel-applet \
-I$(top_builddir)/libpanel-applet \
$(DISABLE_DEPRECATED_CFLAGS) \
$(GNOME_INCLUDEDIR) \
$(WARN_CFLAGS) \
$(CLOCK_CFLAGS) \
$(POLKIT_CFLAGS) \
$(LIBPANEL_APPLET_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBUILDERDIR=\""$(uidir)"\" \
-DCLOCK_MENU_UI_DIR=\""$(xmluidir)"\" \
-DCLOCK_MENU_UI_DIR=\""$(xmluidir)"\" \
-DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\" \
-DLIBDIR=\""$(libdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DPREFIX=\""$(prefix)"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DCLOCK_EDS_ICONDIR="\"$(CLOCK_EDS_ICONDIR)\"" \
-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE \
$(DISABLE_DEPRECATED_CFLAGS)
AM_CFLAGS = $(WARN_CFLAGS)
libsystem_timezone_la_SOURCES = \
system-timezone.c \
system-timezone.h
if HAVE_LIBECAL
CALENDAR_SOURCES = \
......@@ -48,8 +50,6 @@ CLOCK_SOURCES = \
clock-utils.h \
set-timezone.c \
set-timezone.h \
system-timezone.c \
system-timezone.h \
$(BUILT_SOURCES) \
$(CALENDAR_SOURCES)
......@@ -57,14 +57,34 @@ CLOCK_LDADD = \
../../libpanel-applet/libpanel-applet-3.la \
$(CLOCK_LIBS) \
$(LIBPANEL_APPLET_LIBS) \
$(POLKIT_LIBS) \
-lgweather -lm
libsystem-timezone.la \
-lm
BUILT_SOURCES = \
clock-marshallers.c \
clock-marshallers.h \
clock-typebuiltins.c \
clock-typebuiltins.h
test_system_timezone_SOURCES = \
test-system-timezone.c
test_system_timezone_LDADD = $(CLOCK_LDADD) libsystem-timezone.la
if CLOCK_INPROCESS
APPLET_IN_PROCESS = true
APPLET_LOCATION = $(pkglibdir)/libclock-applet.so
clock_appletlibdir = $(pkglibdir)
clock_appletlib_LTLIBRARIES = libclock-applet.la
libclock_applet_la_SOURCES = $(CLOCK_SOURCES)
libclock_applet_la_LIBADD = $(CLOCK_LDADD)
libclock_applet_la_LDFLAGS = -module -avoid-version
libclock_applet_la_CFLAGS = $(AM_CFLAGS)
$(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
else
APPLET_IN_PROCESS = false
APPLET_LOCATION = $(libexecdir)/clock-applet
libexec_PROGRAMS = clock-applet
clock_applet_SOURCES = $(CLOCK_SOURCES)
clock_applet_LDADD = $(CLOCK_LDADD)
clock_applet_CFLAGS = $(AM_CFLAGS)
$(clock_applet_OBJECTS): $(BUILT_SOURCES)
endif
clock-marshallers.c: clock-marshallers.list
$(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
......@@ -101,37 +121,13 @@ clock-typebuiltins.h: @REBUILD@ $(clock_enum_headers)
--fprod "\n/* --- @filename@ --- */" \
--eprod "#define CLOCK_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(clock_enum_headers) > $@
if CLOCK_INPROCESS
APPLET_IN_PROCESS = true
APPLET_LOCATION = $(pkglibdir)/libclock-applet.so
clock_appletlibdir = $(pkglibdir)
clock_appletlib_LTLIBRARIES = libclock-applet.la
libclock_applet_la_SOURCES = $(CLOCK_SOURCES)
libclock_applet_la_LIBADD = $(CLOCK_LDADD)
libclock_applet_la_LDFLAGS = -module -avoid-version
libclock_applet_la_CFLAGS =
$(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
libexec_PROGRAMS =
else
APPLET_IN_PROCESS = false
APPLET_LOCATION = $(libexecdir)/clock-applet
libexec_PROGRAMS = clock-applet
clock_applet_SOURCES = $(CLOCK_SOURCES)
clock_applet_LDADD = $(CLOCK_LDADD)
clock_applet_CFLAGS =
$(clock_applet_OBJECTS): $(BUILT_SOURCES)
endif
uidir = $(datadir)/gnome-panel/ui
ui_DATA = clock.ui
$(clock_enum_headers) > $@
xmluidir = $(datadir)/gnome-panel/ui
xmlui_DATA = clock-menu.xml
BUILT_SOURCES = \
clock-marshallers.c \
clock-marshallers.h \
clock-typebuiltins.c \
clock-typebuiltins.h
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = org.gnome.panel.ClockApplet.panel-applet.in
......@@ -139,10 +135,10 @@ applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
@PANEL_INTLTOOL_PANEL_APPLET_RULE@
......@@ -153,10 +149,16 @@ service_DATA = $(service_in_files:.service.in=.service)
org.gnome.panel.applet.ClockAppletFactory.service: $(service_in_files)
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
endif
uidir = $(datadir)/gnome-panel/ui
ui_DATA = clock.ui
xmluidir = $(datadir)/gnome-panel/ui
xmlui_DATA = clock-menu.xml
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = clock.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
......@@ -164,29 +166,18 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
# don't do this if we are building in eg. rpm
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schemas_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/clock/$$p ; \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/clock/$$p ; \
done \
fi
else
install-data-local:
uninstall-local:
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/clock/$$p ; \
done
endif
noinst_PROGRAMS = test-system-timezone
test_system_timezone_SOURCES = \
system-timezone.c \
system-timezone.h \
test-system-timezone.c \
$(NULL)
test_system_timezone_LDADD = \
$(CLOCK_LDADD) \
$(NULL)
EXTRA_DIST = \
org.gnome.panel.ClockApplet.panel-applet.in.in \
$(schemas_in_files) \
......
......@@ -7,7 +7,7 @@ icon_DATA = \
clock-face-small-day.svg \
clock-face-small-evening.svg \
clock-face-small-night.svg \
clock-map.png \
clock-map.png \
clock-map-location-marker.png \
clock-map-location-current.png \
clock-map-location-hilight.png
......
INCLUDES = \
AM_CPPFLAGS = \
$(LIBPANEL_APPLET_CFLAGS) \
$(FISH_CFLAGS) \
-I$(srcdir) \
-I$(srcdir)/../../libpanel-applet \
-I$(top_builddir)/libpanel-applet \
......@@ -6,10 +8,9 @@ INCLUDES = \
-DFISH_ICONDIR=\""$(fishbitmapsdir)"\" \
-DFISH_BUILDERDIR=\""$(uidir)"\" \
-DFISH_MENU_UI_DIR=\""$(xmluidir)"\" \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(FISH_CFLAGS) \
$(LIBPANEL_APPLET_CFLAGS)
$(DISABLE_DEPRECATED_CFLAGS)
AM_CFLAGS = $(WARN_CFLAGS)
FISH_SOURCES = fish.c
......@@ -27,7 +28,7 @@ fish_applet_lib_LTLIBRARIES = libfish-applet.la
libfish_applet_la_SOURCES = $(FISH_SOURCES)
libfish_applet_la_LIBADD = $(FISH_LDADD)
libfish_applet_la_LDFLAGS = -module -avoid-version
libfish_applet_la_CFLAGS =
libfish_applet_la_CFLAGS = $(AM_CFLAGS)
else
APPLET_IN_PROCESS = false
APPLET_LOCATION = $(libexecdir)/fish-applet
......@@ -35,46 +36,19 @@ APPLET_LOCATION = $(libexecdir)/fish-applet
libexec_PROGRAMS = fish-applet
fish_applet_SOURCES = $(FISH_SOURCES)
fish_applet_LDADD = $(FISH_LDADD)
fish_applet_CFLAGS =
fish_applet_CFLAGS = $(AM_CFLAGS)
endif
FISH_BITMAPS = \
wanda.png \
fishanim.png \
oldwanda.png \
footguy.png \
monkey.png
EXTRA_DIST = \
wanda.svg \
$(FISH_BITMAPS) \
org.gnome.panel.FishApplet.panel-applet.in.in \
$(service_in_files) \
fish.schemas.in \
$(ui_DATA) \
$(xmlui_DATA)
uidir = $(datadir)/gnome-panel/ui
ui_DATA = fish.ui
fishbitmapsdir = $(datadir)/gnome-panel/pixmaps
fishbitmaps_DATA = $(FISH_BITMAPS)
xmluidir = $(datadir)/gnome-panel/ui
xmlui_DATA = fish-menu.xml
CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = org.gnome.panel.FishApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
@PANEL_INTLTOOL_PANEL_APPLET_RULE@
......@@ -85,10 +59,24 @@ service_DATA = $(service_in_files:.service.in=.service)
org.gnome.panel.applet.FishAppletFactory.service: $(service_in_files)
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
endif
fishbitmapsdir = $(datadir)/gnome-panel/pixmaps
fishbitmaps_DATA = \
wanda.png \
fishanim.png \
oldwanda.png \
footguy.png \
monkey.png
uidir = $(datadir)/gnome-panel/ui
ui_DATA = fish.ui
xmluidir = $(datadir)/gnome-panel/ui
xmlui_DATA = fish-menu.xml
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = fish.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
......@@ -96,15 +84,27 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
# don't do this if we are building in eg. rpm
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schemas_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/fish/$$p ; \
done \
fi
else
install-data-local:
uninstall-local:
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/fish/$$p ; \
done
endif
EXTRA_DIST = \
wanda.svg \
$(fishbitmaps_DATA) \
org.gnome.panel.FishApplet.panel-applet.in.in \
$(service_in_files) \
fish.schemas.in \
$(ui_DATA) \
$(xmlui_DATA)
CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
-include $(top_srcdir)/git.mk
INCLUDES = \
noinst_LTLIBRARIES = libtray.la
noinst_PROGRAMS = testtray
AM_CPPFLAGS = \
$(NOTIFICATION_AREA_CFLAGS) \
$(LIBPANEL_APPLET_CFLAGS) \
-I$(srcdir) \
-I$(srcdir)/../../libpanel-applet \
-I$(top_builddir)/libpanel-applet \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(GNOME_INCLUDEDIR) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(NOTIFICATION_AREA_CFLAGS) \
$(LIBPANEL_APPLET_CFLAGS) \
-DG_LOG_DOMAIN=\""notification-area-applet"\" \
-DPREFIX=\"$(prefix)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\" \
-DNOTIFICATION_AREA_MENU_UI_DIR=\""$(uidir)"\"
NOTIFICATION_AREA_SOURCES = \
fixedtip.h \
fixedtip.c \
main.c \
na-tray.c \
na-tray.h \
na-tray-child.c \
na-tray-child.h \
na-tray-manager.c \
na-tray-manager.h \
na-marshal.c \
na-marshal.h
NOTIFICATION_AREA_LDADD = \
-DNOTIFICATION_AREA_MENU_UI_DIR=\""$(uidir)"\" \
$(DISABLE_DEPRECATED_CFLAGS)
AM_CFLAGS = $(WARN_CFLAGS)
libtray_la_SOURCES = \
fixedtip.h \
fixedtip.c \
na-marshal.c \
na-marshal.h \
na-tray.c \
na-tray.h \
na-tray-child.c \
na-tray-child.h \
na-tray-manager.c \
na-tray-manager.h
NOTIFICATION_AREA_SOURCES = main.c
NOTIFICATION_AREA_LDADD = \
../../libpanel-applet/libpanel-applet-3.la \
$(X_LIBS) \
$(NOTIFICATION_AREA_LIBS) \
$(LIBPANEL_APPLET_LIBS)
$(LIBPANEL_APPLET_LIBS) \
libtray.la
testtray_SOURCES = testtray.c
testtray_LDADD = \
$(X_LIBS) \
$(NOTIFICATION_AREA_LIBS) \
libtray.la
if NOTIFICATION_AREA_INPROCESS
APPLET_IN_PROCESS = true
......@@ -43,7 +50,7 @@ notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
libnotification_area_applet_la_SOURCES = $(NOTIFICATION_AREA_SOURCES)
libnotification_area_applet_la_LIBADD = $(NOTIFICATION_AREA_LDADD)
libnotification_area_applet_la_LDFLAGS = -module -avoid-version
libnotification_area_applet_la_CFLAGS =
libnotification_area_applet_la_CFLAGS = $(AM_CFLAGS)
else
APPLET_IN_PROCESS = false
APPLET_LOCATION = $(libexecdir)/notification-area-applet
......@@ -51,19 +58,28 @@ APPLET_LOCATION = $(libexecdir)/notification-area-applet
libexec_PROGRAMS = notification-area-applet
notification_area_applet_SOURCES = $(NOTIFICATION_AREA_SOURCES)
notification_area_applet_LDADD = $(NOTIFICATION_AREA_LDADD)
notification_area_applet_CFLAGS =
notification_area_applet_CFLAGS = $(AM_CFLAGS)
endif
na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)echo "#include \"na-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
BUILT_SOURCES = na-marshal.c na-marshal.h
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
@PANEL_INTLTOOL_PANEL_APPLET_RULE@
......@@ -74,8 +90,8 @@ service_DATA = $(service_in_files:.service.in=.service)
org.gnome.panel.applet.NotificationAreaAppletFactory.service: $(service_in_files)
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
endif
uidir = $(datadir)/gnome-panel/ui
......@@ -87,37 +103,9 @@ EXTRA_DIST = \
$(service_in_files) \
na-marshal.list
BUILT_SOURCES = na-marshal.c na-marshal.h
CLEANFILES = \
$(applet_DATA) \
$(applet_DATA).in \
CLEANFILES = \
$(applet_DATA) \
$(applet_DATA).in \
$(service_DATA)
na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)echo "#include \"na-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
noinst_PROGRAMS = testtray
testtray_SOURCES = \
fixedtip.h \
fixedtip.c \
na-marshal.c \
na-marshal.h \
na-tray.c \
na-tray.h \
na-tray-child.c \
na-tray-child.h \
na-tray-manager.c \
na-tray-manager.h \
testtray.c
testtray_LDADD = \
$(X_LIBS) \
$(PANEL_LIBS)
-include $(top_srcdir)/git.mk
INCLUDES = \
-I$(top_builddir) \
-I$(top_builddir)/applets/wncklet \
-I$(top_srcdir)/libpanel-applet \
-I$(top_builddir)/libpanel-applet \
$(WNCKLET_CFLAGS) \
$(LIBPANEL_APPLET_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(WARN_CFLAGS) \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPAGER_BUILDERDIR=\""$(uidir)"\" \
-DTASKLIST_BUILDERDIR=\""$(uidir)"\" \
-DWNCK_MENU_UI_DIR=\""$(xmluidir)"\" \
-DPREFIX=\"$(prefix)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
AM_CPPFLAGS = \
$(LIBPANEL_APPLET_CFLAGS) \
$(WNCKLET_CFLAGS) \
-I$(top_builddir) \
-I$(top_builddir)/applets/wncklet \
-I$(top_srcdir)/libpanel-applet \
-I$(top_builddir)/libpanel-applet \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPAGER_BUILDERDIR=\""$(uidir)"\" \
-DTASKLIST_BUILDERDIR=\""$(uidir)"\" \
-DWNCK_MENU_UI_DIR=\""$(xmluidir)"\" \
$(DISABLE_DEPRECATED_CFLAGS)
AM_CFLAGS = $(WARN_CFLAGS)
WNCKLET_SOURCES = \
wncklet.c \
......@@ -28,8 +25,6 @@ WNCKLET_SOURCES = \
showdesktop.c \
showdesktop.h
$(wnck_applet_OBJECTS): $(BUILT_SOURCES)
WNCKLET_LDADD = \
../../libpanel-applet/libpanel-applet-3.la \
$(WNCKLET_LIBS) \
......@@ -44,7 +39,7 @@ wnck_appletlib_LTLIBRARIES = libwnck-applet.la
libwnck_applet_la_SOURCES = $(WNCKLET_SOURCES)
libwnck_applet_la_LIBADD = $(WNCKLET_LDADD)
libwnck_applet_la_LDFLAGS = -module -avoid-version
libwnck_applet_la_CFLAGS =
libwnck_applet_la_CFLAGS = $(AM_CFLAGS)
else
APPLET_IN_PROCESS = false
APPLET_LOCATION = $(libexecdir)/wnck-applet
......@@ -52,26 +47,19 @@ APPLET_LOCATION = $(libexecdir)/wnck-applet
libexec_PROGRAMS = wnck-applet
wnck_applet_SOURCES = $(WNCKLET_SOURCES)
wnck_applet_LDADD = $(WNCKLET_LDADD)
wnck_applet_CFLAGS =
wnck_applet_CFLAGS = $(AM_CFLAGS)
endif
EXTRA_DIST = \
org.gnome.panel.Wncklet.panel-applet.in.in \
$(service_in_files) \