diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | applets/battery/Makefile.am | 3 | ||||
| -rw-r--r-- | applets/clock/Makefile.am | 3 | ||||
| -rw-r--r-- | applets/launcher/Makefile.am | 3 | ||||
| -rw-r--r-- | applets/showdesktop/Makefile.am | 3 | ||||
| -rw-r--r-- | applets/systray/Makefile.am | 3 | ||||
| -rw-r--r-- | applets/windowselector/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 |
8 files changed, 21 insertions, 7 deletions
@@ -1,5 +1,13 @@ 2007-01-24 Ross Burton <ross@openedhand.com> + * configure.ac: + Disable static libraries, they are useless here. + + * applets/*/Makefile.am: + Disable library versioning. + +2007-01-24 Ross Burton <ross@openedhand.com> + * matchbox-panel.pc.in: Add a variable for the applet library directory. diff --git a/applets/battery/Makefile.am b/applets/battery/Makefile.am index 684806c..1d37861 100644 --- a/applets/battery/Makefile.am +++ b/applets/battery/Makefile.am @@ -5,11 +5,12 @@ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \ -DDATADIR=\"$(pkgdatadir)/battery/\" AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \ -I$(top_srcdir) -I$(top_builddir) -Werror - + appletdir = $(pkglibdir) applet_LTLIBRARIES = libbattery.la libbattery_la_SOURCES = battery.c libbattery_la_LIBADD = -lapm +libbattery_la_LDFLAGS = -avoid-version MAINTAINERCLEANFILES = Makefile.in diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am index 596b15c..94dae12 100644 --- a/applets/clock/Makefile.am +++ b/applets/clock/Makefile.am @@ -1,10 +1,11 @@ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\" AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \ -I$(top_srcdir) -I$(top_builddir) -Werror - + appletdir = $(pkglibdir) applet_LTLIBRARIES = libclock.la libclock_la_SOURCES = clock.c +libclock_la_LDFLAGS = -avoid-version MAINTAINERCLEANFILES = Makefile.in diff --git a/applets/launcher/Makefile.am b/applets/launcher/Makefile.am index 98eea32..0989600 100644 --- a/applets/launcher/Makefile.am +++ b/applets/launcher/Makefile.am @@ -1,11 +1,12 @@ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\" AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) $(SN_CFLAGS) \ -I$(top_srcdir) -I$(top_builddir) -Werror - + appletdir = $(pkglibdir) applet_LTLIBRARIES = liblauncher.la liblauncher_la_SOURCES = launcher.c liblauncher_la_LIBADD = $(SN_LIBS) +liblauncher_la_LDFLAGS = -avoid-version MAINTAINERCLEANFILES = Makefile.in diff --git a/applets/showdesktop/Makefile.am b/applets/showdesktop/Makefile.am index 4241d12..7db88ad 100644 --- a/applets/showdesktop/Makefile.am +++ b/applets/showdesktop/Makefile.am @@ -1,10 +1,11 @@ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\" AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \ -I$(top_srcdir) -I$(top_builddir) -Werror - + appletdir = $(pkglibdir) applet_LTLIBRARIES = libshowdesktop.la libshowdesktop_la_SOURCES = showdesktop.c +libshowdesktop_la_LDFLAGS = -avoid-version MAINTAINERCLEANFILES = Makefile.in diff --git a/applets/systray/Makefile.am b/applets/systray/Makefile.am index ea43601..13dbd02 100644 --- a/applets/systray/Makefile.am +++ b/applets/systray/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\" AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) $(LIBNOTIFY_CFLAGS) \ -I$(top_srcdir) -I$(top_builddir) - + appletdir = $(pkglibdir) applet_LTLIBRARIES = libsystray.la @@ -24,6 +24,7 @@ libsystray_la_SOURCES = $(BUILT_SOURCES) \ eggtraymanager.h \ systray.c libsystray_la_LIBADD = $(LIBNOTIFY_LIBS) +libsystray_la_LDFLAGS = -avoid-version EXTRA_DIST = eggmarshalers.list diff --git a/applets/windowselector/Makefile.am b/applets/windowselector/Makefile.am index ff9506f..c9f7e35 100644 --- a/applets/windowselector/Makefile.am +++ b/applets/windowselector/Makefile.am @@ -1,10 +1,10 @@ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\" AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \ -I$(top_srcdir) -I$(top_builddir) -Werror - + appletdir = $(pkglibdir) applet_LTLIBRARIES = libwindowselector.la - libwindowselector_la_SOURCES = windowselector.c +libwindowselector_la_LDFLAGS = -avoid-version MAINTAINERCLEANFILES = Makefile.in diff --git a/configure.ac b/configure.ac index 4d88306..5d900c2 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,7 @@ AC_CONFIG_SRCDIR(matchbox-panel/mb-panel.c) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE +AM_DISABLE_STATIC AC_ISC_POSIX AC_PROG_CC AC_STDC_HEADERS |