X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=0c1b9b095f68960d7aae531509dfab4dd09be1dc;hb=a170ad7c85b5f23fafe64d28a3f183a7ce42ce53;hp=b34bfc598e37b7968780770dca6bc69a2dffc778;hpb=0fcf5ead0fb38710e6277da8b59c6ad19f907092;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index b34bfc59..0c1b9b09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,11 @@ rcdir = $(configdir)/openbox xsessionsdir = $(datadir)/xsessions gnomewmfilesdir = $(datadir)/gnome/wm-properties pkgconfigdir = $(libdir)/pkgconfig -pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox +obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox +secretbindir = $(libdir)/openbox theme = Clearlooks @@ -24,14 +26,17 @@ check_PROGRAMS = \ render/rendertest lib_LTLIBRARIES = \ - parser/libobparser.la \ - render/libobrender.la \ - obt/libobt.la + obt/libobt.la \ + render/libobrender.la bin_PROGRAMS = \ openbox/openbox \ + tools/gdm-control/gdm-control \ tools/gnome-panel-control/gnome-panel-control +dist_secretbin_SCRIPTS = \ + tools/xdg-autostart/xdg-autostart + nodist_bin_SCRIPTS = \ data/xsession/openbox-session \ data/xsession/openbox-gnome-session \ @@ -41,15 +46,13 @@ nodist_bin_SCRIPTS = \ render_rendertest_CPPFLAGS = \ $(PANGO_CFLAGS) \ - $(XFT_CFLAGS) \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\"RenderTest\" render_rendertest_LDADD = \ - parser/libobparser.la \ + obt/libobt.la \ render/libobrender.la \ $(GLIB_LIBS) \ $(PANGO_LIBS) \ - $(XFT_LIBS) \ $(XML_LIBS) \ $(X_LIBS) render_rendertest_SOURCES = render/test.c @@ -59,16 +62,14 @@ render_libobrender_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(PANGO_CFLAGS) \ - $(XFT_CFLAGS) \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" render_libobrender_la_LDFLAGS = \ -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) render_libobrender_la_LIBADD = \ - parser/libobparser.la \ + obt/libobt.la \ $(X_LIBS) \ $(PANGO_LIBS) \ - $(XFT_LIBS) \ $(GLIB_LIBS) \ $(XML_LIBS) render_libobrender_la_SOURCES = \ @@ -83,6 +84,8 @@ render_libobrender_la_SOURCES = \ render/icon.h \ render/image.h \ render/image.c \ + render/imagecache.h \ + render/imagecache.c \ render/instance.h \ render/instance.c \ render/mask.h \ @@ -92,24 +95,6 @@ render_libobrender_la_SOURCES = \ render/theme.h \ render/theme.c -## parser ## - -parser_libobparser_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(XML_CFLAGS) \ - -DG_LOG_DOMAIN=\"ObParser\" \ - -DLOCALEDIR=\"$(localedir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DCONFIGDIR=\"$(configdir)\" -parser_libobparser_la_LDFLAGS = \ - -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) -parser_libobparser_la_LIBADD = \ - $(GLIB_LIBS) \ - $(XML_LIBS) -parser_libobparser_la_SOURCES = \ - parser/parse.h \ - parser/parse.c - ## obt ## obt_libobt_la_CPPFLAGS = \ @@ -119,6 +104,7 @@ obt_libobt_la_CPPFLAGS = \ $(XSHAPE_CFLAGS) \ $(XSYNC_CFLAGS) \ $(GLIB_CFLAGS) \ + $(XML_CFLAGS) \ -DG_LOG_DOMAIN=\"Obt\" \ -DLOCALEDIR=\"$(localedir)\" \ -DDATADIR=\"$(datadir)\" \ @@ -131,15 +117,25 @@ obt_libobt_la_LIBADD = \ $(XRANDR_LIBS) \ $(XSHAPE_LIBS) \ $(XSYNC_LIBS) \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(XML_LIBS) obt_libobt_la_SOURCES = \ obt/display.h \ obt/display.c \ + obt/internal.h \ + obt/keyboard.h \ + obt/keyboard.c \ obt/mainloop.h \ obt/mainloop.c \ + obt/parse.h \ + obt/parse.c \ + obt/paths.h \ + obt/paths.c \ obt/prop.h \ obt/prop.c \ - obt/util.h + obt/util.h \ + obt/xevent.h \ + obt/xevent.c ## openbox ## @@ -166,7 +162,6 @@ openbox_openbox_LDADD = \ $(EFENCE_LIBS) \ $(LIBINTL) \ render/libobrender.la \ - parser/libobparser.la \ obt/libobt.la openbox_openbox_LDFLAGS = -export-dynamic openbox_openbox_SOURCES = \ @@ -192,6 +187,7 @@ openbox_openbox_SOURCES = \ openbox/actions/if.c \ openbox/actions/kill.c \ openbox/actions/layer.c \ + openbox/actions/session.c \ openbox/actions/lower.c \ openbox/actions/maximize.c \ openbox/actions/move.c \ @@ -206,6 +202,7 @@ openbox_openbox_SOURCES = \ openbox/actions/resizerelative.c \ openbox/actions/restart.c \ openbox/actions/shade.c \ + openbox/actions/shadelowerraise.c \ openbox/actions/showdesktop.c \ openbox/actions/showmenu.c \ openbox/actions/unfocus.c \ @@ -244,6 +241,8 @@ openbox_openbox_SOURCES = \ openbox/grab.h \ openbox/group.c \ openbox/group.h \ + openbox/hooks.c \ + openbox/hooks.h \ openbox/keyboard.c \ openbox/keyboard.h \ openbox/keytree.c \ @@ -253,8 +252,6 @@ openbox_openbox_SOURCES = \ openbox/menu.c \ openbox/menu.h \ openbox/misc.h \ - openbox/modkeys.c \ - openbox/modkeys.h \ openbox/mouse.c \ openbox/mouse.h \ openbox/moveresize.c \ @@ -266,6 +263,8 @@ openbox_openbox_SOURCES = \ openbox/ping.h \ openbox/place.c \ openbox/place.h \ + openbox/prompt.c \ + openbox/prompt.h \ openbox/popup.c \ openbox/popup.h \ openbox/resist.c \ @@ -292,6 +291,17 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c +## gdm-control ## + +tools_gdm_control_gdm_control_CPPFLAGS = \ + $(X_CFLAGS) \ + $(GLIB_CFLAGS) +tools_gdm_control_gdm_control_LDADD = \ + $(X_LIBS) \ + $(GLIB_LIBS) +tools_gdm_control_gdm_control_SOURCES = \ + tools/gdm-control/gdm-control.c + ## default button masks ## dist_docxbm_DATA = \ @@ -312,6 +322,10 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3 dist_clearlooks_theme_DATA= \ themes/Clearlooks/openbox-3/themerc +clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3 +dist_clearlooks34_theme_DATA= \ + themes/Clearlooks-3.4/openbox-3/themerc + clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3 dist_clearlooksolive_theme_DATA= \ themes/Clearlooks-Olive/openbox-3/themerc @@ -383,7 +397,7 @@ dist_syscrash_theme_DATA= \ ## public headers ## -pubinclude_HEADERS = \ +rrpubinclude_HEADERS = \ render/color.h \ render/font.h \ render/geom.h \ @@ -393,17 +407,21 @@ pubinclude_HEADERS = \ render/mask.h \ render/render.h \ render/theme.h \ - parser/parse.h \ + render/version.h + +obtpubinclude_HEADERS = \ obt/display.h \ + obt/keyboard.h \ obt/mainloop.h \ - obt/util.h - -nodist_pubinclude_HEADERS = \ - version.h + obt/parse.h \ + obt/paths.h \ + obt/prop.h \ + obt/util.h \ + obt/version.h \ + obt/xevent.h nodist_pkgconfig_DATA = \ render/obrender-4.0.pc \ - parser/obparser-4.0.pc \ obt/obt-4.0.pc ## data ## @@ -411,16 +429,23 @@ nodist_pkgconfig_DATA = \ dist_pixmap_DATA = \ data/openbox.png +nodist_rc_DATA = \ + data/autostart.sh + dist_rc_DATA = \ - data/autostart.sh \ data/rc.xml \ data/menu.xml edit = $(SED) \ -e 's!@version\@!$(VERSION)!' \ -e 's!@configdir\@!$(configdir)!' \ + -e 's!@secretbindir\@!$(secretbindir)!' \ -e 's!@bindir\@!$(bindir)!' +data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ + %.desktop: %.desktop.in Makefile @echo make: creating $@ @$(edit) $< >$@ @@ -446,7 +471,7 @@ nodist_xsessions_DATA = \ data/xsession/openbox-kde.desktop dist_noinst_DATA = \ - version.h.in \ + data/autostart.sh.in \ data/rc.xsd \ data/menu.xsd \ data/xsession/openbox.desktop.in \ @@ -463,9 +488,10 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ + render/version.h.in \ render/obrender-4.0.pc.in \ - parser/obparser-4.0.pc.in \ obt/obt-4.0.pc.in \ + obt/version.h.in \ tools/themeupdate/themeupdate.py \ tests/hideshow.py \ tests/Makefile \