diff --git a/Makefile.am b/Makefile.am index 172b3b12..cdf5e4ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,386 @@ -SUBDIRS = m4 po themes data render parser kernel plugins tools -MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in +SUBDIRS = m4 po -doc: - $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc +themedir = $(datadir)/openbox/themes +localedir = $(datadir)/locale +rcdir = $(datadir)/openbox +plugindir = $(libdir)/openbox/plugins +desktopfilesdir = $(datadir)/gnome/wm-properties -distclean-local: - rm -f *\~ gmon.out .\#* +theme = operation +AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 +INCLUDES = -I. + +noinst_PROGRAMS = \ + render/rendertest + +lib_LTLIBRARIES = \ + render/libobrender.la \ + parser/libobparser.la + +bin_PROGRAMS = \ + kernel/openbox + +plugin_LTLIBRARIES = \ + plugins/resistance/resistance.la \ + plugins/placement/placement.la \ + plugins/mouse/mouse.la \ + plugins/keyboard/keyboard.la \ + plugins/menu/timed_menu.la \ + plugins/menu/fifo_menu.la \ + plugins/menu/client_menu.la + +if OBCONF +plugin_LTLIBRARIES += \ + plugins/resistance/resistance-config.la +endif + +## render ## + +render_rendertest_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\"RenderTest\" +render_rendertest_LDADD = render/libobrender.la +render_rendertest_SOURCES = render/test.c + +render_libobrender_la_CPPFLAGS = \ + $(X_CFLAGS) \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\"ObRender\" \ + -DDEFAULT_THEME=\"$(theme)\" \ + -DTHEMEDIR=\"$(themedir)\" +render_libobrender_la_LIBADD = \ + $(X_LIBS) \ + $(XFT_LIBS) \ + $(GLIB_LIBS) +render_libobrender_la_SOURCES = \ + gettext.h \ + render/color.h \ + render/color.c \ + render/font.h \ + render/font.c \ + render/geom.h \ + render/gradient.h \ + render/gradient.c \ + render/image.h \ + render/image.c \ + render/instance.h \ + render/instance.c \ + render/mask.h \ + render/mask.c \ + render/render.h \ + render/render.c \ + render/theme.h \ + render/theme.c + +## parser ## + +parser_libobparser_la_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(XML_CFLAGS) \ + -DG_LOG_DOMAIN=\"ObParser\" \ + -DLOCALEDIR=\"$(localedir)\" \ + -DRCDIR=\"$(rcdir)\" +parser_libobparser_la_LIBADD = \ + $(GLIB_LIBS) \ + $(XML_LIBS) +parser_libobparser_la_SOURCES = \ + parser/parse.h \ + parser/parse.c + +## kernel ## + +kernel_openbox_CPPFLAGS = \ + $(X_CFLAGS) \ + $(SM_CFLAGS) \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DLOCALEDIR=\"$(localedir)\" \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DRCDIR=\"$(rcdir)\" \ + -DG_LOG_DOMAIN=\"Openbox\" +kernel_openbox_LDADD = \ + $(SM_LIBS) \ + $(XINERAMA_LIBS) \ + $(XKB_LIBS) \ + $(XRANDR_LIBS) \ + $(VIDMODE_LIBS) \ + $(XSHAPE_LIBS) \ + $(GLIB_LIBS) \ + $(GMODULE_LIBS) \ + $(LIBSN_LIBS) \ + $(XML_LIBS) \ + $(EFENCE_LIBS) \ + $(LIBINTL) \ + render/libobrender.la \ + parser/libobparser.la +kernel_openbox_LDFLAGS = -export-dynamic +kernel_openbox_SOURCES = \ + gettext.h \ + kernel/action.c \ + kernel/action.h \ + kernel/client.c \ + kernel/client.h \ + kernel/config.c \ + kernel/config.h \ + kernel/debug.c \ + kernel/debug.h \ + kernel/dispatch.c \ + kernel/dispatch.h \ + kernel/dock.c \ + kernel/dock.h \ + kernel/event.c \ + kernel/event.h \ + kernel/extensions.c \ + kernel/extensions.h \ + kernel/focus.c \ + kernel/focus.h \ + kernel/frame.c \ + kernel/frame.h \ + kernel/framerender.c \ + kernel/framerender.h \ + kernel/geom.h \ + kernel/grab.c \ + kernel/grab.h \ + kernel/group.c \ + kernel/group.h \ + kernel/menu.c \ + kernel/menu.h \ + kernel/menu_render.c \ + kernel/moveresize.c \ + kernel/moveresize.h \ + kernel/openbox.c \ + kernel/openbox.h \ + kernel/plugin.c \ + kernel/plugin.h \ + kernel/popup.c \ + kernel/popup.h \ + kernel/prop.c \ + kernel/prop.h \ + kernel/screen.c \ + kernel/screen.h \ + kernel/stacking.c \ + kernel/stacking.h \ + kernel/startup.c \ + kernel/startup.h \ + kernel/timer.c \ + kernel/timer.h \ + kernel/window.c \ + kernel/window.h \ + kernel/xerror.c \ + kernel/xerror.h \ + plugins/interface.h + +## plugins/resistance ## + +plugins_resistance_resistance_la_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Plugin-Resistance\" +plugins_resistance_resistance_la_LDFLAGS = \ + -module \ + -avoid-version +plugins_resistance_resistance_la_SOURCES = \ + plugins/resistance/resistance.c \ + plugins/resistance/resistance.h + +if OBCONF +plugins_resistance_resistance_config_la_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Plugin-Resistance\" \ + $(GTK_CFLAGS) \ + $(GLADE_CFLAGS) +plugins_resistance_resistance_config_la_LDFLAGS = \ + -module \ + -avoid-version +plugins_resistance_resistance_config_la_SOURCES = \ + plugins/resistance/resistance_config.c +endif + +## plugins/placement ## + +plugins_placement_placement_la_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Plugin-Placement\" +plugins_placement_placement_la_LDFLAGS = \ + -module \ + -avoid-version +plugins_placement_placement_la_SOURCES = \ + plugins/placement/placement.c \ + plugins/placement/history.c \ + plugins/placement/history.h + +## plugins/mouse ## + +plugins_mouse_mouse_la_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Plugin-Mouse\" +plugins_mouse_mouse_la_LDFLAGS = \ + -module \ + -avoid-version +plugins_mouse_mouse_la_SOURCES = \ + plugins/mouse/mouse.c \ + plugins/mouse/mouse.h \ + plugins/mouse/translate.c \ + plugins/mouse/translate.h + +## plugins/mouse ## + +plugins_keyboard_keyboard_la_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Plugin-Keyboard\" +plugins_keyboard_keyboard_la_LDFLAGS = \ + -module \ + -avoid-version +plugins_keyboard_keyboard_la_SOURCES = \ + plugins/keyboard/keyboard.c \ + plugins/keyboard/keyboard.h \ + plugins/keyboard/tree.c \ + plugins/keyboard/tree.h \ + plugins/keyboard/translate.c \ + plugins/keyboard/translate.h + +## plugins/menu ## + +plugins_menu_timed_menu_la_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Plugin-Timed-Menu\" +plugins_menu_timed_menu_la_LDFLAGS = \ + -module \ + -avoid-version +plugins_menu_timed_menu_la_SOURCES = \ + plugins/menu/timed_menu.c \ + plugins/menu/timed_menu.h + +plugins_menu_fifo_menu_la_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Plugin-Fifo-Menu\" +plugins_menu_fifo_menu_la_LDFLAGS = \ + -module \ + -avoid-version +plugins_menu_fifo_menu_la_SOURCES = \ + plugins/menu/fifo_menu.c \ + plugins/menu/fifo_menu.h + +plugins_menu_client_menu_la_CPPFLAGS = \ + $(XFT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBSN_CFLAGS) \ + $(XML_CFLAGS) \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Plugin-Client-Menu\" +plugins_menu_client_menu_la_LDFLAGS = \ + -module \ + -avoid-version +plugins_menu_client_menu_la_SOURCES = \ + plugins/menu/client_menu.c \ + plugins/menu/client_menu.h + +## themes ## + +dist_theme_DATA = \ + themes/artwiz \ + themes/bbs \ + themes/bluebox \ + themes/cthulhain \ + themes/deep \ + themes/ebox \ + themes/fieron \ + themes/fieron2 \ + themes/flux \ + themes/frobozz \ + themes/frobust \ + themes/mbdtex \ + themes/miklos \ + themes/nyz \ + themes/nyzclone \ + themes/ob20 \ + themes/operation \ + themes/outcomes \ + themes/paper \ + themes/purplehaaze \ + themes/shade \ + themes/steelblue \ + themes/steelblue2 \ + themes/the_orange \ + themes/trisb \ + themes/twice \ + themes/warp-xp + +fieronthemedir = $(themedir)/fieron_data +dist_fierontheme_DATA = \ + themes/fieron_data/close.xbm \ + themes/fieron_data/iconify.xbm \ + themes/fieron_data/max.xbm \ + themes/fieron_data/stick.xbm + +fieron2themedir = $(themedir)/fieron2_data +dist_fieron2theme_DATA = \ + themes/fieron2_data/close.xbm \ + themes/fieron2_data/iconify.xbm \ + themes/fieron2_data/max.xbm \ + themes/fieron2_data/stick.xbm + +eboxthemedir = $(themedir)/ebox_data +dist_eboxtheme_DATA = \ + themes/ebox_data/close.xbm \ + themes/ebox_data/iconify.xbm \ + themes/ebox_data/max.xbm + +## data ## + +dist_rc_DATA = \ + data/rc3 + EXTRA_DIST = \ - config.rpath \ - mkinstalldirs \ - README \ - COPYING \ - AUTHORS + config.rpath \ + mkinstalldirs \ + README \ + COPYING \ + AUTHOR + +#doc: +# $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc + +distclean-local: + for d in . m4 po render; do \ + for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \ + $(RM) "$$d/$$p"; \ + done \ + done .PHONY: doc diff --git a/configure.ac b/configure.ac index 11b23b79..d462ddc0 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,7 @@ test "$SED" || AC_MSG_ERROR([sed not found]) # Determine build target OB_DEBUG # Pick compiler specific/build target flags, and set $CVS +AM_PROG_CC_C_O OB_COMPILER_FLAGS AC_C_CONST AC_C_INLINE @@ -99,25 +100,11 @@ X11_EXT_VIDMODE X11_EXT_SHAPE X11_EXT_XINERAMA -AC_CONFIG_FILES([Makefile - m4/Makefile - po/Makefile.in - themes/Makefile - themes/ebox_data/Makefile - themes/fieron_data/Makefile - themes/fieron2_data/Makefile - data/Makefile - render/Makefile - parser/Makefile - kernel/Makefile - plugins/Makefile - plugins/resistance/Makefile - plugins/placement/Makefile - plugins/mouse/Makefile - plugins/keyboard/Makefile - plugins/menu/Makefile - tools/Makefile - tools/obconf/Makefile]) +AC_CONFIG_FILES([ + Makefile + m4/Makefile + po/Makefile.in +]) AC_OUTPUT AC_MSG_RESULT diff --git a/data/.cvsignore b/data/.cvsignore index 3dda7298..e69de29b 100644 --- a/data/.cvsignore +++ b/data/.cvsignore @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/data/Makefile b/data/Makefile new file mode 100644 index 00000000..b90edacf --- /dev/null +++ b/data/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C .. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 99d47b3a..00000000 --- a/data/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -rcdir=$(datadir)/openbox - -rc_DATA=rc3 - -EXTRA_DIST=$(rc_DATA) - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/openbox/.cvsignore b/openbox/.cvsignore index cbc484f1..e982b462 100644 --- a/openbox/.cvsignore +++ b/openbox/.cvsignore @@ -26,7 +26,6 @@ screen.lo stacking.lo timer.lo xerror.lo -Makefile.in .deps -Makefile openbox +.dirstamp diff --git a/openbox/Makefile b/openbox/Makefile new file mode 100644 index 00000000..b90edacf --- /dev/null +++ b/openbox/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C .. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/openbox/Makefile.am b/openbox/Makefile.am deleted file mode 100644 index 8e5144ab..00000000 --- a/openbox/Makefile.am +++ /dev/null @@ -1,87 +0,0 @@ -localedir=$(datadir)/locale -rcdir=$(datadir)/openbox -plugindir=$(libdir)/openbox/plugins -desktopfilesdir=$(datadir)/gnome/wm-properties - -binary=openbox -url=http://openbox.org/ - -AM_CPPFLAGS=$(X_CFLAGS) $(SM_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) \ - $(GMODULE_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) \ - -DLOCALEDIR=\"$(localedir)\" \ - -DPLUGINDIR=\"$(plugindir)\" \ - -DRCDIR=\"$(rcdir)\" \ - -DG_LOG_DOMAIN=\"Openbox\" \ - -DBINARY=\"$(binary)\" - -INCLUDES=-I.. -LIBS=$(X_LIBS) $(SM_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(XKB_LIBS) \ - $(XRANDR_LIBS) $(VIDMODE_LIBS) $(XSHAPE_LIBS) $(GLIB_LIBS) \ - $(GMODULE_LIBS) $(LIBSN_LIBS) $(XML_LIBS) $(EFENCE_LIBS) \ - @LIBS@ @LIBINTL@ - -bin_PROGRAMS=$(binary) - -openbox_LDADD=-lobrender -L../render -lobparser -L../parser -openbox_LDFLAGS=-export-dynamic -openbox_SOURCES=\ - action.h \ - action.c \ - client.h \ - client.c \ - config.h \ - config.c \ - extensions.h \ - extensions.c \ - focus.h \ - focus.c \ - frame.h \ - frame.c \ - grab.h \ - grab.c \ - menu.h \ - menu.c \ - menu_render.c \ - openbox.h \ - openbox.c \ - framerender.h \ - framerender.c \ - plugin.h \ - plugin.c \ - prop.h \ - prop.c \ - screen.h \ - screen.c \ - stacking.h \ - stacking.c \ - dispatch.h \ - dispatch.c \ - event.h \ - event.c \ - group.h \ - group.c \ - timer.h \ - timer.c \ - xerror.h \ - xerror.c \ - moveresize.h \ - moveresize.c \ - startup.h \ - startup.c \ - popup.h \ - popup.c \ - dock.h \ - dock.c \ - window.h \ - window.c \ - gettext.h \ - geom.h - -desktopfiles_DATA=openbox.desktop - -EXTRA_DIST=$(desktopfiles_DATA) - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/parser/.cvsignore b/parser/.cvsignore index cb737897..8951724b 100644 --- a/parser/.cvsignore +++ b/parser/.cvsignore @@ -1,6 +1,5 @@ .deps .libs -Makefile -Makefile.in libobparser.la -parse.lo +.dirstamp +parser_libobparser_la-parse.lo diff --git a/parser/Makefile b/parser/Makefile new file mode 100644 index 00000000..b90edacf --- /dev/null +++ b/parser/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C .. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/parser/Makefile.am b/parser/Makefile.am deleted file mode 100644 index 3a6b81c2..00000000 --- a/parser/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -localedir=$(datadir)/locale -rcdir=$(datadir)/openbox - -AM_CPPFLAGS=$(GLIB_CFLAGS) $(XML_CFLAGS) \ - -DG_LOG_DOMAIN=\"Parser\" \ - -DLOCALEDIR=\"$(localedir)\" \ - -DRCDIR=\"$(rcdir)\" - -INCLUDES=-I.. -LIBS=$(GLIB_LIBS) $(XML_LIBS) @LIBS@ - -lib_LTLIBRARIES=libobparser.la -libobparser_la_SOURCES=parse.c parse.h - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/.cvsignore b/plugins/.cvsignore index 4e780f86..96381e2d 100644 --- a/plugins/.cvsignore +++ b/plugins/.cvsignore @@ -1,7 +1,2 @@ -resistance.la .libs -resistance.lo -Makefile.in .deps -resistance_la-resistance.lo -Makefile diff --git a/plugins/Makefile.am b/plugins/Makefile.am deleted file mode 100644 index 3d623b21..00000000 --- a/plugins/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIRS = keyboard mouse placement menu resistance - -EXTRA_DIST = interface.h obconf_interface.h - -MAINTAINERCLEANFILES= Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/keyboard/.cvsignore b/plugins/keyboard/.cvsignore index 953f4184..2d55ccb0 100644 --- a/plugins/keyboard/.cvsignore +++ b/plugins/keyboard/.cvsignore @@ -1,10 +1,7 @@ -keyboard.lo keyboard.la -tree.lo -translate.lo -keyaction.lo .libs -keyparse.lo -Makefile.in .deps -Makefile +.dirstamp +plugins_keyboard_keyboard_la-keyboard.lo +plugins_keyboard_keyboard_la-translate.lo +plugins_keyboard_keyboard_la-tree.lo diff --git a/plugins/keyboard/Makefile b/plugins/keyboard/Makefile new file mode 100644 index 00000000..cfc46539 --- /dev/null +++ b/plugins/keyboard/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C ../.. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am deleted file mode 100644 index 82ed50b4..00000000 --- a/plugins/keyboard/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -plugindir=$(libdir)/openbox/plugins - -AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \ - $(XML_CFLAGS) \ - -DG_LOG_DOMAIN=\"Plugin-Keyboard\" - -INCLUDES=-I../.. - -plugin_LTLIBRARIES=keyboard.la - -keyboard_la_LDFLAGS=-module -avoid-version -keyboard_la_SOURCES=\ - keyboard.h \ - keyboard.c \ - translate.h \ - translate.c \ - tree.h \ - tree.c - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/menu/.cvsignore b/plugins/menu/.cvsignore index df44dd6c..c2fe749e 100644 --- a/plugins/menu/.cvsignore +++ b/plugins/menu/.cvsignore @@ -1,10 +1,9 @@ .deps .libs -Makefile -Makefile.in timed_menu.la -timed_menu.lo fifo_menu.la -fifo_menu.lo client_menu.la -client_menu.lo +.dirstamp +plugins_menu_client_menu_la-client_menu.lo +plugins_menu_fifo_menu_la-fifo_menu.lo +plugins_menu_timed_menu_la-timed_menu.lo diff --git a/plugins/menu/Makefile b/plugins/menu/Makefile new file mode 100644 index 00000000..cfc46539 --- /dev/null +++ b/plugins/menu/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C ../.. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/plugins/menu/Makefile.am b/plugins/menu/Makefile.am deleted file mode 100644 index 84b18bfb..00000000 --- a/plugins/menu/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -plugindir=$(libdir)/openbox/plugins - -AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(XML_CFLAGS) \ - -DG_LOG_DOMAIN=\"Plugin-Timed-Menu\" - -INCLUDES=-I../.. - -#plugin_LTLIBRARIES=timed_menu.la fifo_menu.la client_menu.la - -#timed_menu_la_LDFLAGS=-module -avoid-version -#timed_menu_la_SOURCES=timed_menu.c timed_menu.h - -#fifo_menu_la_LDFLAGS=-module -avoid-version -#fifo_menu_la_SOURCES=fifo_menu.c fifo_menu.h - -#client_menu_la_LDFLAGS=-module -avoid-version -#client_menu_la_SOURCES=client_menu.c - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/mouse/.cvsignore b/plugins/mouse/.cvsignore index ed5c2905..9d1b8607 100644 --- a/plugins/mouse/.cvsignore +++ b/plugins/mouse/.cvsignore @@ -1,8 +1,6 @@ -mouse.lo mouse.la -translate.lo -mouseparse.lo .libs -Makefile.in .deps -Makefile +.dirstamp +plugins_mouse_mouse_la-mouse.lo +plugins_mouse_mouse_la-translate.lo diff --git a/plugins/mouse/Makefile b/plugins/mouse/Makefile new file mode 100644 index 00000000..cfc46539 --- /dev/null +++ b/plugins/mouse/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C ../.. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am deleted file mode 100644 index 5595fe69..00000000 --- a/plugins/mouse/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -plugindir=$(libdir)/openbox/plugins - -AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \ - $(XML_CFLAGS) \ - -DG_LOG_DOMAIN=\"Plugin-Mouse\" - -INCLUDES=-I../.. - -plugin_LTLIBRARIES=mouse.la - -mouse_la_LDFLAGS=-module -avoid-version -mouse_la_SOURCES=\ - mouse.h \ - mouse.c \ - translate.h \ - translate.c - -noinst_HEADERS=mouse.h translate.h - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/placement/.cvsignore b/plugins/placement/.cvsignore index c2a167d8..991f13fe 100644 --- a/plugins/placement/.cvsignore +++ b/plugins/placement/.cvsignore @@ -1,7 +1,6 @@ placement.la -placement.lo -history.lo .libs -Makefile.in .deps -Makefile +.dirstamp +plugins_placement_placement_la-history.lo +plugins_placement_placement_la-placement.lo diff --git a/plugins/placement/Makefile b/plugins/placement/Makefile new file mode 100644 index 00000000..cfc46539 --- /dev/null +++ b/plugins/placement/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C ../.. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/plugins/placement/Makefile.am b/plugins/placement/Makefile.am deleted file mode 100644 index 58fa1fa7..00000000 --- a/plugins/placement/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -plugindir=$(libdir)/openbox/plugins - -AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \ - $(XML_CFLAGS) \ - -DG_LOG_DOMAIN=\"Plugin-Placement\" - -INCLUDES=-I../.. - -plugin_LTLIBRARIES=placement.la - -placement_la_LDFLAGS=-module -avoid-version -placement_la_SOURCES=history.c history.h placement.c - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/resistance/.cvsignore b/plugins/resistance/.cvsignore index fe97c5fa..4b63246e 100644 --- a/plugins/resistance/.cvsignore +++ b/plugins/resistance/.cvsignore @@ -1,8 +1,7 @@ .deps .libs -Makefile -Makefile.in resistance-config.la resistance.la -resistance_config_la-resistance_config.lo -resistance_la-resistance.lo +.dirstamp +plugins_resistance_resistance_la-resistance.lo +plugins_resistance_resistance_config_la-resistance_config.lo diff --git a/plugins/resistance/Makefile b/plugins/resistance/Makefile new file mode 100644 index 00000000..cfc46539 --- /dev/null +++ b/plugins/resistance/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C ../.. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/plugins/resistance/Makefile.am b/plugins/resistance/Makefile.am deleted file mode 100644 index 7ef2ea9f..00000000 --- a/plugins/resistance/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -plugindir=$(libdir)/openbox/plugins - -AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \ - $(XML_CFLAGS) \ - -DPLUGINDIR=\"$(plugindir)\" - -INCLUDES=-I../.. -I../../tools - -plugin_LTLIBRARIES=resistance.la -if OBCONF -plugin_LTLIBRARIES+=resistance-config.la -endif - -resistance_la_CPPFLAGS=$(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Plugin-Resistance\" -resistance_la_LDFLAGS=-module -avoid-version -resistance_la_SOURCES=resistance.c resistance.h - -if OBCONF -resistance_config_la_CPPFLAGS=$(AM_CPPFLAGS) \ - -DG_LOG_DOMAIN=\"Plugin-Resistance\" \ - $(GTK_CFLAGS) $(GLADE_CFLAGS) -resistance_config_la_LDFLAGS=-module -avoid-version -resistance_config_la_SOURCES=resistance_config.c -endif - -noinst_DATA=resistance.glade resistance.gladep - -EXTRA_DIST=$(noinst_DATA) - -MAINTAINERCLEANFILES= Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/render/.cvsignore b/render/.cvsignore index 41200f78..12e915ba 100644 --- a/render/.cvsignore +++ b/render/.cvsignore @@ -1,16 +1,14 @@ rendertest librender.a .libs -color.lo -font.lo -gradient.lo -image.lo -mask.lo -render.lo -test.lo +render_libobrender_la-color.lo +render_libobrender_la-font.lo +render_libobrender_la-gradient.lo +render_libobrender_la-image.lo +render_libobrender_la-mask.lo +render_libobrender_la-render.lo libobrender.la -theme.lo -Makefile.in +render_libobrender_la-theme.lo .deps -Makefile -instance.lo +render_libobrender_la-instance.lo +.dirstamp diff --git a/render/Makefile b/render/Makefile new file mode 100644 index 00000000..b90edacf --- /dev/null +++ b/render/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C .. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/render/Makefile.am b/render/Makefile.am deleted file mode 100644 index 49e9b4f9..00000000 --- a/render/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -themedir=$(datadir)/openbox/themes - -theme=operation - -AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \ - -DG_LOG_DOMAIN=\"Render\" \ - -DDEFAULT_THEME=\"$(theme)\" \ - -DTHEMEDIR=\"$(themedir)\" - -INCLUDES=-I.. -LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GL_LIBS) @LIBS@ - -noinst_PROGRAMS=rendertest -rendertest_LDFLAGS=-lobrender -L. -rendertest_SOURCES=test.c - -lib_LTLIBRARIES=libobrender.la -libobrender_la_SOURCES=\ - color.h \ - color.c \ - font.h \ - font.c \ - gradient.h \ - gradient.c \ - image.h \ - image.c \ - mask.h \ - mask.c \ - render.h \ - render.c \ - theme.h \ - theme.c \ - instance.h \ - instance.c - - -noinst_HEADERS=render.h gradient.h color.h font.h mask.h image.h - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/themes/.cvsignore b/themes/.cvsignore index 3dda7298..e69de29b 100644 --- a/themes/.cvsignore +++ b/themes/.cvsignore @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/themes/Makefile b/themes/Makefile new file mode 100644 index 00000000..b90edacf --- /dev/null +++ b/themes/Makefile @@ -0,0 +1,4 @@ +all clean install: + $(MAKE) -C .. -$(MAKEFLAGS) $@ + +.PHONY: all clean install diff --git a/themes/Makefile.am b/themes/Makefile.am deleted file mode 100644 index 381b9d1b..00000000 --- a/themes/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -themedir=$(datadir)/openbox/themes - -SUBDIRS=ebox_data fieron_data fieron2_data - -theme_DATA=artwiz bbs bluebox cthulhain deep ebox fieron fieron2 flux frobozz \ - frobust mbdtex miklos nyz nyzclone ob20 operation outcomes paper \ - purplehaaze shade steelblue steelblue2 the_orange trisb twice \ - warp-xp - -EXTRA_DIST=$(theme_DATA) - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/themes/ebox_data/.cvsignore b/themes/ebox_data/.cvsignore index 282522db..e69de29b 100644 --- a/themes/ebox_data/.cvsignore +++ b/themes/ebox_data/.cvsignore @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/themes/ebox_data/Makefile.am b/themes/ebox_data/Makefile.am deleted file mode 100644 index a03f8153..00000000 --- a/themes/ebox_data/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedatadir=$(datadir)/openbox/themes/ebox_data - -themedata_DATA=\ - close.xbm \ - iconify.xbm \ - max.xbm - -EXTRA_DIST=$(themedata_DATA) - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/themes/fieron2_data/.cvsignore b/themes/fieron2_data/.cvsignore index 282522db..e69de29b 100644 --- a/themes/fieron2_data/.cvsignore +++ b/themes/fieron2_data/.cvsignore @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/themes/fieron2_data/Makefile.am b/themes/fieron2_data/Makefile.am deleted file mode 100644 index 3309af5c..00000000 --- a/themes/fieron2_data/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -themedatadir=$(datadir)/openbox/themes/fieron2_data - -themedata_DATA=\ - close.xbm \ - iconify.xbm \ - max.xbm \ - stick.xbm - -EXTRA_DIST=$(themedata_DATA) - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/themes/fieron_data/.cvsignore b/themes/fieron_data/.cvsignore index 282522db..e69de29b 100644 --- a/themes/fieron_data/.cvsignore +++ b/themes/fieron_data/.cvsignore @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/themes/fieron_data/Makefile.am b/themes/fieron_data/Makefile.am deleted file mode 100644 index 0f35e1ab..00000000 --- a/themes/fieron_data/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -themedatadir=$(datadir)/openbox/themes/fieron_data - -themedata_DATA=\ - close.xbm \ - iconify.xbm \ - max.xbm \ - stick.xbm - -EXTRA_DIST=$(themedata_DATA) - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 86eaea70..00000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = - -if OBCONF -SUBDIRS += obconf -endif diff --git a/tools/obconf/Makefile.am b/tools/obconf/Makefile.am deleted file mode 100644 index fcfadba6..00000000 --- a/tools/obconf/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -localedir=$(datadir)/locale -plugindir=$(libdir)/openbox/plugins -rcdir=$(datadir)/openbox - -AM_CPPFLAGS=$(GTK_CFLAGS) $(GLADE_CFLAGS) $(GMODULE_CFLAGS) $(XML_CFLAGS) \ - -DLOCALEDIR=\"$(localedir)\" \ - -DRCDIR=\"$(rcdir)\" \ - -DPLUGINDIR=\"$(plugindir)\" \ - -DG_LOG_DOMAIN=\"ObConf\" - -INCLUDES=-I../.. -LIBS=$(GTK_LIBS) $(GLADE_LIBS) $(GMODULE_LIBS) $(XML_LIBS) @LIBS@ @LIBINTL@ - -bin_PROGRAMS=obconf - -obconf_LDADD=-lobparser -L../../parser -obconf_LDFLAGS=-export-dynamic -obconf_SOURCES=\ - obconf.h \ - main.c \ - about.c \ - plugins.h \ - plugins.c - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#*