X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=fd9ea7a2af2c50b08f05925b21cd4fa5e8c6df0a;hb=7f7378cc2b0712de050a93bdfa116788de06a23a;hp=b4aeea1952395bfaacd75a5b8f47910dccead66b;hpb=1045079482453424f8320de99639390e3020eb72;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index b4aeea19..fd9ea7a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,6 @@ SUBDIRS = m4 po themedir = $(datadir)/openbox/themes localedir = $(datadir)/locale rcdir = $(datadir)/openbox -plugindir = $(libdir)/openbox/plugins desktopfilesdir = $(datadir)/gnome/wm-properties pixmapdir = $(datadir)/pixmaps @@ -22,23 +21,12 @@ lib_LTLIBRARIES = \ parser/libobparser.la bin_PROGRAMS = \ - kernel/openbox \ + openbox/openbox \ tools/kdetrayproxy/kdetrayproxy -plugin_LTLIBRARIES = \ - plugins/resistance/resistance.la \ - plugins/placement/placement.la \ - plugins/menu/timed_menu.la \ - plugins/menu/fifo_menu.la \ - plugins/menu/client_menu.la \ - plugins/menu/include_menu.la - if OBCONF bin_PROGRAMS += \ tools/obconf/obconf - -#plugin_LTLIBRARIES += \ -# plugins/resistance/resistance-config.la endif ## render ## @@ -96,21 +84,19 @@ parser_libobparser_la_SOURCES = \ parser/parse.h \ parser/parse.c -## kernel ## +## openbox ## -kernel_openbox_CPPFLAGS = \ +openbox_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 = \ +openbox_openbox_LDADD = \ $(SM_LIBS) \ $(XINERAMA_LIBS) \ $(XKB_LIBS) \ @@ -118,188 +104,84 @@ kernel_openbox_LDADD = \ $(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 = \ +openbox_openbox_LDFLAGS = -export-dynamic +openbox_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/keyboard.c \ - kernel/keyboard.h \ - kernel/keytree.c \ - kernel/keytree.h \ - kernel/menu.c \ - kernel/menu.h \ - kernel/menu_render.c \ - kernel/misc.h \ - kernel/mouse.c \ - kernel/mouse.h \ - kernel/moveresize.c \ - kernel/moveresize.h \ - kernel/mwm.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/session.c \ - kernel/session.h \ - kernel/stacking.c \ - kernel/stacking.h \ - kernel/startup.c \ - kernel/startup.h \ - kernel/timer.c \ - kernel/timer.h \ - kernel/translate.c \ - kernel/translate.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/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_include_menu_la_CPPFLAGS = \ - $(XFT_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(LIBSN_CFLAGS) \ - $(XML_CFLAGS) \ - -DPLUGINDIR=\"$(plugindir)\" \ - -DG_LOG_DOMAIN=\"Plugin-Include-Menu\" -plugins_menu_include_menu_la_LDFLAGS = \ - -module \ - -avoid-version -plugins_menu_include_menu_la_SOURCES = \ - plugins/menu/include_menu.c - + openbox/action.c \ + openbox/action.h \ + openbox/client.c \ + openbox/client.h \ + openbox/client_list_menu.c \ + openbox/client_list_menu.h \ + openbox/client_menu.c \ + openbox/client_menu.h \ + openbox/config.c \ + openbox/config.h \ + openbox/debug.c \ + openbox/debug.h \ + openbox/dock.c \ + openbox/dock.h \ + openbox/event.c \ + openbox/event.h \ + openbox/extensions.c \ + openbox/extensions.h \ + openbox/focus.c \ + openbox/focus.h \ + openbox/frame.c \ + openbox/frame.h \ + openbox/framerender.c \ + openbox/framerender.h \ + openbox/geom.h \ + openbox/grab.c \ + openbox/grab.h \ + openbox/group.c \ + openbox/group.h \ + openbox/keyboard.c \ + openbox/keyboard.h \ + openbox/keytree.c \ + openbox/keytree.h \ + openbox/mainloop.c \ + openbox/mainloop.h \ + openbox/menuframe.c \ + openbox/menuframe.h \ + openbox/menu.c \ + openbox/menu.h \ + openbox/misc.h \ + openbox/mouse.c \ + openbox/mouse.h \ + openbox/moveresize.c \ + openbox/moveresize.h \ + openbox/mwm.h \ + openbox/openbox.c \ + openbox/openbox.h \ + openbox/place.c \ + openbox/place.h \ + openbox/popup.c \ + openbox/popup.h \ + openbox/prop.c \ + openbox/prop.h \ + openbox/resist.c \ + openbox/resist.h \ + openbox/screen.c \ + openbox/screen.h \ + openbox/session.c \ + openbox/session.h \ + openbox/stacking.c \ + openbox/stacking.h \ + openbox/startup.c \ + openbox/startup.h \ + openbox/translate.c \ + openbox/translate.h \ + openbox/window.c \ + openbox/window.h \ + openbox/xerror.c \ + openbox/xerror.h ## obconf ## @@ -308,7 +190,6 @@ tools_obconf_obconf_CPPFLAGS = \ $(GDK_PIXBUF_CFLAGS) \ $(XML_CFLAGS) \ -DLOCALEDIR=\"$(localedir)\" \ - -DPLUGINDIR=\"$(plugindir)\" \ -DRCDIR=\"$(rcdir)\" \ -DPIXMAPDIR=\"$(pixmapdir)\" \ -DG_LOG_DOMAIN=\"Obconf\" @@ -320,8 +201,7 @@ tools_obconf_obconf_LDADD = \ parser/libobparser.la tools_obconf_obconf_SOURCES = \ gettext.h \ - tools/obconf/main.c \ - plugins/obconf_interface.h + tools/obconf/main.c ## kdetrayproxy ##