aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--applets/Makefile.applets10
-rw-r--r--applets/battery/Makefile.am14
-rw-r--r--applets/brightness/Makefile.am18
-rw-r--r--applets/clock/Makefile.am14
-rw-r--r--applets/common/test_main.c1
-rw-r--r--applets/exit/Makefile.am14
-rw-r--r--applets/launcher/Makefile.am14
-rw-r--r--applets/notify/Makefile.am13
-rw-r--r--applets/showdesktop/Makefile.am14
-rw-r--r--applets/startup-notify/Makefile.am17
-rw-r--r--applets/startup/Makefile.am18
-rw-r--r--applets/systray/Makefile.am19
-rw-r--r--applets/windowselector/Makefile.am14
-rw-r--r--configure.ac10
14 files changed, 51 insertions, 139 deletions
diff --git a/applets/Makefile.applets b/applets/Makefile.applets
index a55764b..8218c6e 100644
--- a/applets/Makefile.applets
+++ b/applets/Makefile.applets
@@ -1,5 +1,15 @@
+AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
+ -DGETTEXT_PACKAGE=\"matchbox-panel\" \
+ $(MATCHBOX_PANEL_CFLAGS) \
+ -I$(top_srcdir) -I$(top_builddir)
+AM_CFLAGS = $(WARN_CFLAGS)
+
+appletdir = $(pkglibdir)
+
# Binary to check that the applet actually links against everything it needs.
noinst_PROGRAMS = test-linkage
test_linkage_SOURCES = $(srcdir)/../common/test_main.c \
$(top_srcdir)/matchbox-panel/mb-panel-scaling-image.c
test_linkage_LDADD = $(MATCHBOX_PANEL_LIBS)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/applets/battery/Makefile.am b/applets/battery/Makefile.am
index 35bfb83..df9a88f 100644
--- a/applets/battery/Makefile.am
+++ b/applets/battery/Makefile.am
@@ -1,14 +1,9 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- -DDATADIR=\"$(pkgdatadir)/battery/\" \
- $(MATCHBOX_PANEL_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+include ../Makefile.applets
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libbattery.la
libbattery_la_SOURCES = battery.c battery.h
+libbattery_la_CPPFLAGS = $(AM_CPPFLAGS) -DDATADIR=\"$(pkgdatadir)/battery/\"
if HAVE_LIBAPM
libbattery_la_LIBADD = -lapm
@@ -19,10 +14,7 @@ if HAVE_LIBACPI
libbattery_la_LIBADD = -lacpi
libbattery_la_SOURCES += battery-acpi.c
endif
-libbattery_la_LDFLAGS = -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-include ../Makefile.applets
+libbattery_la_LDFLAGS = -avoid-version -module
test_linkage_LDADD += libbattery.la
diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am
index 90d2189..26321d2 100644
--- a/applets/brightness/Makefile.am
+++ b/applets/brightness/Makefile.am
@@ -1,20 +1,10 @@
-SUBDIRS = data
+include ../Makefile.applets
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- -DDATADIR=\"$(pkgdatadir)/brightness/\" \
- $(MATCHBOX_PANEL_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+SUBDIRS = data
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libbrightness.la
-
libbrightness_la_SOURCES = brightness.c
-libbrightness_la_LDFLAGS = -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
+libbrightness_la_CPPFLAGS = $(AM_CPPFLAGS) -DDATADIR=\"$(pkgdatadir)/brightness/\"
+libbrightness_la_LDFLAGS = -avoid-version -module
test_linkage_LDADD += libbrightness.la
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 0e2fe90..a0bb495 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -1,17 +1,7 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- $(MATCHBOX_PANEL_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+include ../Makefile.applets
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libclock.la
-
libclock_la_SOURCES = clock.c
-libclock_la_LDFLAGS = -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
+libclock_la_LDFLAGS = -avoid-version -module
test_linkage_LDADD += libclock.la
diff --git a/applets/common/test_main.c b/applets/common/test_main.c
index 2b81233..4558616 100644
--- a/applets/common/test_main.c
+++ b/applets/common/test_main.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include <gtk/gtk.h>
extern GtkWidget *mb_panel_applet_create (const char *id, GtkOrientation orientation);
diff --git a/applets/exit/Makefile.am b/applets/exit/Makefile.am
index 3869891..81260d5 100644
--- a/applets/exit/Makefile.am
+++ b/applets/exit/Makefile.am
@@ -1,17 +1,7 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- $(MATCHBOX_PANEL_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+include ../Makefile.applets
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libexit.la
-
libexit_la_SOURCES = exit.c
-libexit_la_LDFLAGS = -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
+libexit_la_LDFLAGS = -avoid-version -module
test_linkage_LDADD += libexit.la
diff --git a/applets/launcher/Makefile.am b/applets/launcher/Makefile.am
index 205c2e1..7be9292 100644
--- a/applets/launcher/Makefile.am
+++ b/applets/launcher/Makefile.am
@@ -1,18 +1,10 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- $(MATCHBOX_PANEL_CFLAGS) $(SN_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+include ../Makefile.applets
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = liblauncher.la
liblauncher_la_SOURCES = launcher.c
+liblauncher_la_CPPFLAGS = $(AM_CPPFLAGS) $(SN_CFLAGS)
liblauncher_la_LIBADD = $(SN_LIBS)
-liblauncher_la_LDFLAGS = -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
+liblauncher_la_LDFLAGS = -avoid-version -module
test_linkage_LDADD += liblauncher.la
diff --git a/applets/notify/Makefile.am b/applets/notify/Makefile.am
index 5af5fb4..d906f43 100644
--- a/applets/notify/Makefile.am
+++ b/applets/notify/Makefile.am
@@ -1,10 +1,5 @@
-AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- $(MATCHBOX_PANEL_CFLAGS) $(DBUS_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+include ../Makefile.applets
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libnotify.la
libnotify_la_SOURCES = applet.c \
@@ -13,7 +8,8 @@ libnotify_la_SOURCES = applet.c \
$(DBUS_GLUE) \
$(MARSHALS)
-libnotify_la_LDFLAGS = -avoid-version -Wl,--no-undefined
+libnotify_la_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS)
+libnotify_la_LDFLAGS = -avoid-version -module
libnotify_la_LIBADD = $(MATCHBOX_PANEL_LIBS) $(DBUS_LIBS)
DBUS_GLUE=notification-manager-glue.h
@@ -29,8 +25,5 @@ MARSHALS = marshal.c marshal.h
BUILT_SOURCES = $(DBUS_GLUE) $(MARSHALS)
CLEANFILES = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
test_linkage_LDADD += libnotify.la
diff --git a/applets/showdesktop/Makefile.am b/applets/showdesktop/Makefile.am
index b1ba2a3..f14a463 100644
--- a/applets/showdesktop/Makefile.am
+++ b/applets/showdesktop/Makefile.am
@@ -1,17 +1,7 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- $(MATCHBOX_PANEL_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+include ../Makefile.applets
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libshowdesktop.la
-
libshowdesktop_la_SOURCES = showdesktop.c
-libshowdesktop_la_LDFLAGS = -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
+libshowdesktop_la_LDFLAGS = -avoid-version -module
test_linkage_LDADD += libshowdesktop.la
diff --git a/applets/startup-notify/Makefile.am b/applets/startup-notify/Makefile.am
index 7027fe4..80405a5 100644
--- a/applets/startup-notify/Makefile.am
+++ b/applets/startup-notify/Makefile.am
@@ -1,16 +1,11 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- $(MATCHBOX_PANEL_CFLAGS) \
- $(DBUS_CFLAGS) $(SN_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+include ../Makefile.applets
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libstartup-notify.la
libstartup_notify_la_SOURCES = startup.c $(MARSHALS)
-libstartup_notify_la_LIBADD = $(SN_LIBS) $(DBUS_LIBS)
-libstartup_notify_la_LDFLAGS = -avoid-version
+libstartup_notify_la_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(SN_CFLAGS)
+libstartup_notify_la_LIBADD = $(DBUS_LIBS) $(SN_LIBS)
+libstartup_notify_la_LDFLAGS = -avoid-version -module
MARSHALS = marshal.c marshal.h
%.c: %.list
@@ -22,8 +17,4 @@ MARSHALS = marshal.c marshal.h
BUILT_SOURCES = $(MARSHALS)
CLEANFILES = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
-
test_linkage_LDADD += libstartup-notify.la
diff --git a/applets/startup/Makefile.am b/applets/startup/Makefile.am
index 73f5c20..cfce2e6 100644
--- a/applets/startup/Makefile.am
+++ b/applets/startup/Makefile.am
@@ -1,21 +1,11 @@
-SUBDIRS = data
+include ../Makefile.applets
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- -DDATADIR=\"$(pkgdatadir)/startup/\" \
- $(MATCHBOX_PANEL_CFLAGS) $(SN_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+SUBDIRS = data
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libstartup.la
-
libstartup_la_SOURCES = startup.c
+libstartup_la_CPPFLAGS = $(AM_CPPFLAGS) $(SN_CFLAGS) -DDATADIR=\"$(pkgdatadir)/startup/\"
libstartup_la_LIBADD = $(SN_LIBS)
-libstartup_la_LDFLAGS = -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
+libstartup_la_LDFLAGS = -avoid-version -module
test_linkage_LDADD += libstartup.la
diff --git a/applets/systray/Makefile.am b/applets/systray/Makefile.am
index 9c7b471..92d925d 100644
--- a/applets/systray/Makefile.am
+++ b/applets/systray/Makefile.am
@@ -1,11 +1,4 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- $(MATCHBOX_PANEL_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
-
-appletdir = $(pkglibdir)
-applet_LTLIBRARIES = libsystray.la
+include ../Makefile.applets
%.c: %.list
$(AM_V_GEN) (echo "#include \"na-marshal.h\""; \
@@ -13,20 +6,18 @@ applet_LTLIBRARIES = libsystray.la
%.h: %.list
$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_na_marshal $^ --header > $@
-BUILT_SOURCES = na-marshal.c na-marshal.h
-
+applet_LTLIBRARIES = libsystray.la
libsystray_la_SOURCES = $(BUILT_SOURCES) \
na-tray-manager.c \
na-tray-manager.h \
systray.c
-libsystray_la_LDFLAGS = -avoid-version
+libsystray_la_LDFLAGS = -avoid-version -module
EXTRA_DIST = na-marshal.list
+BUILT_SOURCES = na-marshal.c na-marshal.h
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
-
-include ../Makefile.applets
+MAINTAINERCLEANFILES += $(BUILT_SOURCES)
test_linkage_LDADD += libsystray.la
diff --git a/applets/windowselector/Makefile.am b/applets/windowselector/Makefile.am
index 4277f88..d4ad710 100644
--- a/applets/windowselector/Makefile.am
+++ b/applets/windowselector/Makefile.am
@@ -1,16 +1,8 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DGETTEXT_PACKAGE=\"matchbox-panel\" \
- $(MATCHBOX_PANEL_CFLAGS) $(SN_CFLAGS) \
- -I$(top_srcdir) -I$(top_builddir)
-AM_CFLAGS = $(WARN_CFLAGS)
+include ../Makefile.applets
-appletdir = $(pkglibdir)
applet_LTLIBRARIES = libwindowselector.la
libwindowselector_la_SOURCES = windowselector.c
-libwindowselector_la_LDFLAGS = -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../Makefile.applets
+libwindowselector_la_CPPFLAGS = $(AM_CPPFLAGS) $(SN_CFLAGS)
+libwindowselector_la_LDFLAGS = -avoid-version -module
test_linkage_LDADD += libwindowselector.la
diff --git a/configure.ac b/configure.ac
index 5aaa745..55de6ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,19 +90,19 @@ Makefile
matchbox-panel.pc
matchbox-panel/Makefile
applets/Makefile
+applets/battery/Makefile
+applets/brightness/Makefile
+applets/brightness/data/Makefile
applets/clock/Makefile
applets/exit/Makefile
applets/launcher/Makefile
applets/notify/Makefile
+applets/showdesktop/Makefile
+applets/startup-notify/Makefile
applets/startup/Makefile
applets/startup/data/Makefile
-applets/startup-notify/Makefile
applets/systray/Makefile
-applets/showdesktop/Makefile
applets/windowselector/Makefile
-applets/battery/Makefile
-applets/brightness/Makefile
-applets/brightness/data/Makefile
po/Makefile.in
po/Makefile
])
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-15 01:01:25 +0000