Rewrite built-in plugin rules.
authorJim Huang <jserv.tw@gmail.com>
Sat, 7 Oct 2006 17:35:34 +0000 (17:35 +0000)
committerJim Huang <jserv.tw@gmail.com>
Sat, 7 Oct 2006 17:35:34 +0000 (17:35 +0000)
configure.ac
src/Makefile.am
src/plugins/Makefile.am [new file with mode: 0644]

index 842ba27..5fd7c69 100644 (file)
@@ -55,6 +55,7 @@ AM_GLIB_GNU_GETTEXT
 AC_CONFIG_FILES([
        Makefile
        src/Makefile
+       src/plugins/Makefile
        src/plugins/netstatus/Makefile
        po/Makefile.in
        data/Makefile
index f6b6a29..dd678d3 100644 (file)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = plugins/netstatus
+SUBDIRS = plugins
 
 bin_PROGRAMS = lxpanel lxpanelctl
 
@@ -11,21 +11,7 @@ INCLUDES = \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        $(PACKAGE_CFLAGS)
 
-PLUGINS_SOURCES= \
-       plugins/cpu.c \
-       plugins/deskno.c \
-       plugins/launchbar.c \
-       plugins/ptk-app-menu.c \
-       plugins/taskbar.c \
-       plugins/dclock.c \
-       plugins/icons.c \
-       plugins/menu.c \
-       plugins/separator.c \
-       plugins/deskno2.c \
-       plugins/image.c \
-       plugins/pager.c \
-       plugins/space.c \
-       plugins/wincmd.c
+BUILTIN_PLUGINS = $(top_builddir)/src/plugins/libbuiltin_plugins.a
 
 TRAY_SOURCES= \
        systray/eggmarshalers.c systray/eggmarshalers.h \
@@ -35,7 +21,6 @@ TRAY_SOURCES= \
 
 lxpanel_SOURCES = \
        misc.c misc.h \
-       $(PLUGINS_SOURCES) \
        $(TRAY_SOURCES) \
        bg.c bg.h  \
        configurator.c \
@@ -47,7 +32,10 @@ lxpanel_SOURCES = \
        plugin.c plugin.h \
        gtk-run.c
 
-lxpanel_LDADD = $(PACKAGE_LIBS) $(INTLLIBS)
+lxpanel_LDADD = \
+               $(BUILTIN_PLUGINS) \
+               $(PACKAGE_LIBS) \
+               $(INTLLIBS)
 
 lxpanelctl_SOURCES = lxpanelctl.c lxpanelctl.h
 lxpanelctl_LDADD = -lX11 $(INTLLIBS)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
new file mode 100644 (file)
index 0000000..1fa2d51
--- /dev/null
@@ -0,0 +1,37 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = netstatus
+
+noinst_LIBRARIES = libbuiltin_plugins.a
+
+INCLUDES = \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/plugins \
+       -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+       -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+       $(PACKAGE_CFLAGS)
+
+PLUGINS_SOURCES= \
+       cpu.c \
+       deskno.c \
+       launchbar.c \
+       ptk-app-menu.c \
+       taskbar.c \
+       dclock.c \
+       icons.c \
+       menu.c \
+       separator.c \
+       deskno2.c \
+       image.c \
+       pager.c \
+       space.c \
+       wincmd.c
+
+libbuiltin_plugins_a_SOURCES = \
+       $(PLUGINS_SOURCES)
+
+libbuiltin_plugins_a_LIBADD =
+
+EXTRA_DIST = \
+       icon.xpm