X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=9e8316f8212560ac87862ee77103eb69c942031e;hb=5960d27b1c35c58d3c1731c71c44b9c61328a34d;hp=8f4c14e2018e81a0c57f04cfb917ef5526fa225c;hpb=d608649e8540db6842b1fd57d5f23c230346167e;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 8f4c14e2..9e8316f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,8 @@ check_PROGRAMS = \ lib_LTLIBRARIES = \ parser/libobparser.la \ - render/libobrender.la + render/libobrender.la \ + obt/libobt.la bin_PROGRAMS = \ openbox/openbox \ @@ -36,9 +37,6 @@ nodist_bin_SCRIPTS = \ data/xsession/openbox-gnome-session \ data/xsession/openbox-kde-session -noinst_PROGRAMS = \ - tools/themetoxml/themetoxml - ## render ## render_rendertest_CPPFLAGS = \ @@ -65,7 +63,7 @@ render_libobrender_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" render_libobrender_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) render_libobrender_la_LIBADD = \ parser/libobparser.la \ $(X_LIBS) \ @@ -104,7 +102,7 @@ parser_libobparser_la_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -DCONFIGDIR=\"$(configdir)\" parser_libobparser_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) parser_libobparser_la_LIBADD = \ $(GLIB_LIBS) \ $(XML_LIBS) @@ -112,15 +110,39 @@ parser_libobparser_la_SOURCES = \ parser/parse.h \ parser/parse.c -## openbox ## +## obt ## -openbox_openbox_CPPFLAGS = \ - $(SM_CFLAGS) \ +obt_libobt_la_CPPFLAGS = \ $(XINERAMA_CFLAGS) \ $(XKB_CFLAGS) \ $(XRANDR_CFLAGS) \ $(XSHAPE_CFLAGS) \ $(XSYNC_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\"Obt\" \ + -DLOCALEDIR=\"$(localedir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DCONFIGDIR=\"$(configdir)\" +obt_libobt_la_LDFLAGS = \ + -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE) +obt_libobt_la_LIBADD = \ + $(XINERAMA_LIBS) \ + $(XKB_LIBS) \ + $(XRANDR_LIBS) \ + $(XSHAPE_LIBS) \ + $(XSYNC_LIBS) \ + $(GLIB_LIBS) +obt_libobt_la_SOURCES = \ + obt/display.h \ + obt/display.c \ + obt/mainloop.h \ + obt/mainloop.c \ + obt/util.h + +## openbox ## + +openbox_openbox_CPPFLAGS = \ + $(SM_CFLAGS) \ $(X_CFLAGS) \ $(XCURSOR_CFLAGS) \ $(SM_CFLAGS) \ @@ -134,11 +156,6 @@ openbox_openbox_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ $(SM_LIBS) \ - $(XINERAMA_LIBS) \ - $(XKB_LIBS) \ - $(XRANDR_LIBS) \ - $(XSHAPE_LIBS) \ - $(XSYNC_LIBS) \ $(GLIB_LIBS) \ $(X_LIBS) \ $(XCURSOR_LIBS) \ @@ -147,12 +164,51 @@ openbox_openbox_LDADD = \ $(EFENCE_LIBS) \ $(LIBINTL) \ render/libobrender.la \ - parser/libobparser.la + parser/libobparser.la \ + obt/libobt.la openbox_openbox_LDFLAGS = -export-dynamic openbox_openbox_SOURCES = \ gettext.h \ - openbox/action.c \ - openbox/action.h \ + openbox/actions/all.c \ + openbox/actions/all.h \ + openbox/actions/addremovedesktop.c \ + openbox/actions/breakchroot.c \ + openbox/actions/close.c \ + openbox/actions/cyclewindows.c \ + openbox/actions/debug.c \ + openbox/actions/decorations.c \ + openbox/actions/desktop.c \ + openbox/actions/dockautohide.c \ + openbox/actions/directionalwindows.c \ + openbox/actions/execute.c \ + openbox/actions/exit.c \ + openbox/actions/focus.c \ + openbox/actions/focustobottom.c \ + openbox/actions/fullscreen.c \ + openbox/actions/growtoedge.c \ + openbox/actions/iconify.c \ + openbox/actions/if.c \ + openbox/actions/kill.c \ + openbox/actions/layer.c \ + openbox/actions/lower.c \ + openbox/actions/maximize.c \ + openbox/actions/move.c \ + openbox/actions/moverelative.c \ + openbox/actions/moveresizeto.c \ + openbox/actions/movetoedge.c \ + openbox/actions/omnipresent.c \ + openbox/actions/raise.c \ + openbox/actions/raiselower.c \ + openbox/actions/reconfigure.c \ + openbox/actions/resize.c \ + openbox/actions/resizerelative.c \ + openbox/actions/restart.c \ + openbox/actions/shade.c \ + openbox/actions/showdesktop.c \ + openbox/actions/showmenu.c \ + openbox/actions/unfocus.c \ + openbox/actions.c \ + openbox/actions.h \ openbox/client.c \ openbox/client.h \ openbox/client_list_menu.c \ @@ -169,8 +225,6 @@ openbox_openbox_SOURCES = \ openbox/dock.h \ openbox/event.c \ openbox/event.h \ - openbox/extensions.c \ - openbox/extensions.h \ openbox/focus.c \ openbox/focus.h \ openbox/focus_cycle.c \ @@ -192,8 +246,6 @@ openbox_openbox_SOURCES = \ openbox/keyboard.h \ openbox/keytree.c \ openbox/keytree.h \ - openbox/mainloop.c \ - openbox/mainloop.h \ openbox/menuframe.c \ openbox/menuframe.h \ openbox/menu.c \ @@ -208,14 +260,14 @@ openbox_openbox_SOURCES = \ openbox/mwm.h \ openbox/openbox.c \ openbox/openbox.h \ + openbox/ping.c \ + openbox/ping.h \ openbox/place.c \ openbox/place.h \ openbox/popup.c \ openbox/popup.h \ openbox/prop.c \ openbox/prop.h \ - openbox/propwin.c \ - openbox/propwin.h \ openbox/resist.c \ openbox/resist.h \ openbox/screen.c \ @@ -229,25 +281,7 @@ openbox_openbox_SOURCES = \ openbox/translate.c \ openbox/translate.h \ openbox/window.c \ - openbox/window.h \ - openbox/xerror.c \ - openbox/xerror.h - - -## themetoxml ## - -tools_themetoxml_themetoxml_CPPFLAGS = \ - $(X_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(XML_CFLAGS) -tools_themetoxml_themetoxml_LDADD = \ - $(X_LIBS) \ - $(GLIB_LIBS) \ - $(XML_LIBS) -tools_themetoxml_themetoxml_SOURCES = \ - tools/themetoxml/themetoxml.c \ - tools/themetoxml/rgb.h - + openbox/window.h ## gnome-panel-control ## @@ -276,11 +310,11 @@ dist_docxbm_DATA = \ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3 dist_clearlooks_theme_DATA= \ - themes/Clearlooks/openbox-3/themerc.xml + themes/Clearlooks/openbox-3/themerc clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3 dist_clearlooksolive_theme_DATA= \ - themes/Clearlooks-Olive/openbox-3/themerc.xml + themes/Clearlooks-Olive/openbox-3/themerc mikachu_themedir = $(themedir)/Mikachu/openbox-3 dist_mikachu_theme_DATA= \ @@ -289,7 +323,7 @@ dist_mikachu_theme_DATA= \ themes/Mikachu/openbox-3/desk.xbm \ themes/Mikachu/openbox-3/iconify.xbm \ themes/Mikachu/openbox-3/max.xbm \ - themes/Mikachu/openbox-3/themerc.xml + themes/Mikachu/openbox-3/themerc natura_themedir = $(themedir)/Natura/openbox-3 @@ -306,11 +340,11 @@ dist_natura_theme_DATA= \ themes/Natura/openbox-3/max.xbm \ themes/Natura/openbox-3/shade.xbm \ themes/Natura/openbox-3/shade_hover.xbm \ - themes/Natura/openbox-3/themerc.xml + themes/Natura/openbox-3/themerc artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3 dist_artwizboxed_theme_DATA= \ - themes/Artwiz-boxed/openbox-3/themerc.xml + themes/Artwiz-boxed/openbox-3/themerc bear2_themedir = $(themedir)/Bear2/openbox-3 dist_bear2_theme_DATA= \ @@ -325,11 +359,19 @@ dist_bear2_theme_DATA= \ themes/Bear2/openbox-3/max.xbm \ themes/Bear2/openbox-3/shade_pressed.xbm \ themes/Bear2/openbox-3/shade.xbm \ - themes/Bear2/openbox-3/themerc.xml + themes/Bear2/openbox-3/themerc orang_themedir = $(themedir)/Orang/openbox-3 dist_orang_theme_DATA= \ - themes/Orang/openbox-3/themerc.xml + themes/Orang/openbox-3/themerc + +onyx_themedir = $(themedir)/Onyx/openbox-3 +dist_onyx_theme_DATA= \ + themes/Onyx/openbox-3/themerc + +onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3 +dist_onyxcitrus_theme_DATA= \ + themes/Onyx-Citrus/openbox-3/themerc syscrash_themedir = $(themedir)/Syscrash/openbox-3 dist_syscrash_theme_DATA= \ @@ -337,7 +379,7 @@ dist_syscrash_theme_DATA= \ themes/Syscrash/openbox-3/max_pressed.xbm \ themes/Syscrash/openbox-3/max_toggled.xbm \ themes/Syscrash/openbox-3/max.xbm \ - themes/Syscrash/openbox-3/themerc.xml + themes/Syscrash/openbox-3/themerc ## public headers ## @@ -351,14 +393,18 @@ pubinclude_HEADERS = \ render/mask.h \ render/render.h \ render/theme.h \ - parser/parse.h + parser/parse.h \ + obt/display.h \ + obt/mainloop.h \ + obt/util.h nodist_pubinclude_HEADERS = \ version.h nodist_pkgconfig_DATA = \ - render/obrender-3.0.pc \ - parser/obparser-3.0.pc + render/obrender-4.0.pc \ + parser/obparser-4.0.pc \ + obt/obt-4.0.pc ## data ## @@ -403,7 +449,6 @@ dist_noinst_DATA = \ version.h.in \ data/rc.xsd \ data/menu.xsd \ - data/themerc.xsd \ data/xsession/openbox.desktop.in \ data/xsession/openbox-gnome.desktop.in \ data/xsession/openbox-kde.desktop.in \ @@ -418,8 +463,9 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ - render/obrender-3.0.pc.in \ - parser/obparser-3.0.pc.in \ + render/obrender-4.0.pc.in \ + parser/obparser-4.0.pc.in \ + obt/obt-4.0.pc.in \ tools/themeupdate/themeupdate.py \ tests/hideshow.py \ tests/Makefile \ @@ -446,7 +492,6 @@ dist_doc_DATA = \ COPYING \ data/rc.xsd \ data/menu.xsd \ - data/themerc.xsd \ doc/rc-mouse-focus.xml nodist_man_MANS = \ @@ -456,17 +501,7 @@ nodist_man_MANS = \ doc/openbox-kde-session.1 EXTRA_DIST = \ - debian/changelog.in \ - debian/compat \ - debian/conffiles \ - debian/control \ - debian/copyright \ - debian/menu \ - debian/postinst \ - debian/postrm \ - debian/rules \ - config.rpath \ - mkinstalldirs + config.rpath # make clean doesn't delete these for some reason, even though they are # built by make @@ -486,7 +521,7 @@ CLEANFILES = \ # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc distclean-local: - for d in . m4 po render; do \ + for d in . m4 po render parser obt openbox; do \ for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \ rm -f "$$d/$$p"; \ done \