X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=b34bfc598e37b7968780770dca6bc69a2dffc778;hb=0fcf5ead0fb38710e6277da8b59c6ad19f907092;hp=523d73a9b7ae2f79ddca56eb39a16fb7fe62db74;hpb=e4c0504058024ae7450d287a5726186c1bfb5444;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 523d73a9..b34bfc59 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 \ @@ -62,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) \ @@ -101,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) @@ -109,18 +110,41 @@ 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) \ - $(XRENDER_CFLAGS) \ - $(XDAMAGE_CFLAGS) \ - $(XCOMPOSITE_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/prop.h \ + obt/prop.c \ + obt/util.h + +## openbox ## + +openbox_openbox_CPPFLAGS = \ + $(SM_CFLAGS) \ $(X_CFLAGS) \ $(XCURSOR_CFLAGS) \ $(SM_CFLAGS) \ @@ -134,15 +158,7 @@ openbox_openbox_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ $(SM_LIBS) \ - $(XINERAMA_LIBS) \ - $(XKB_LIBS) \ - $(XRANDR_LIBS) \ - $(XSHAPE_LIBS) \ - $(XSYNC_LIBS) \ $(GLIB_LIBS) \ - $(XRENDER_LIBS) \ - $(XDAMAGE_LIBS) \ - $(XCOMPOSITE_LIBS) \ $(X_LIBS) \ $(XCURSOR_LIBS) \ $(LIBSN_LIBS) \ @@ -150,7 +166,8 @@ 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 \ @@ -164,12 +181,11 @@ openbox_openbox_SOURCES = \ openbox/actions/decorations.c \ openbox/actions/desktop.c \ openbox/actions/dockautohide.c \ - openbox/actions/directionalcyclewindows.c \ - openbox/actions/directionaldesktop.c \ - openbox/actions/directionaltargetwindow.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 \ @@ -178,13 +194,10 @@ openbox_openbox_SOURCES = \ openbox/actions/layer.c \ openbox/actions/lower.c \ openbox/actions/maximize.c \ - openbox/actions/maximizehorizontal.c \ - openbox/actions/maximizevertical.c \ - openbox/actions/menu.c \ openbox/actions/move.c \ openbox/actions/moverelative.c \ - openbox/actions/moveto.c \ - openbox/actions/movetofromedge.c \ + openbox/actions/moveresizeto.c \ + openbox/actions/movetoedge.c \ openbox/actions/omnipresent.c \ openbox/actions/raise.c \ openbox/actions/raiselower.c \ @@ -194,6 +207,7 @@ openbox_openbox_SOURCES = \ 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 \ @@ -205,8 +219,6 @@ openbox_openbox_SOURCES = \ openbox/client_list_combined_menu.h \ openbox/client_menu.c \ openbox/client_menu.h \ - openbox/composite.c \ - openbox/composite.h \ openbox/config.c \ openbox/config.h \ openbox/debug.c \ @@ -215,8 +227,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 \ @@ -238,8 +248,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 \ @@ -254,14 +262,12 @@ 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 \ @@ -275,10 +281,7 @@ openbox_openbox_SOURCES = \ openbox/translate.c \ openbox/translate.h \ openbox/window.c \ - openbox/window.h \ - openbox/xerror.c \ - openbox/xerror.h - + openbox/window.h ## gnome-panel-control ## @@ -390,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 ## @@ -456,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 \ @@ -493,8 +501,7 @@ nodist_man_MANS = \ doc/openbox-kde-session.1 EXTRA_DIST = \ - config.rpath \ - mkinstalldirs + config.rpath # make clean doesn't delete these for some reason, even though they are # built by make @@ -514,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 \