projects / mikachu / openbox.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
some changes to the build stuff for debian
[mikachu/openbox.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index af283aa..3150589 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = m4 po
 
+docxbmdir       = $(docdir)/xbm
 themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
 configdir       = $(sysconfdir)/xdg
@@ -32,9 +33,7 @@ bin_PROGRAMS = \
 
 bin_SCRIPTS = \
        data/xsession/openbox-gnome-session \
-       data/xsession/openbox-kde-session \
-       data/xsession/openbox-gnome \
-       data/xsession/openbox-kde
+       data/xsession/openbox-kde-session
 
 noinst_PROGRAMS = \
        tools/themetoxml/themetoxml
@@ -43,6 +42,7 @@ noinst_PROGRAMS = \
 
 render_rendertest_CPPFLAGS = \
        $(PANGO_CFLAGS) \
+       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -50,6 +50,7 @@ render_rendertest_LDADD = \
        render/libobrender.la \
        $(GLIB_LIBS) \
        $(PANGO_LIBS) \
+       $(XFT_LIBS) \
        $(XML_LIBS) \
        $(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -59,6 +60,7 @@ render_libobrender_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
+       $(XFT_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -67,6 +69,7 @@ render_libobrender_la_LIBADD = \
        parser/libobparser.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
+       $(XFT_LIBS) \
        $(GLIB_LIBS) \
        $(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -204,6 +207,8 @@ openbox_openbox_SOURCES = \
        openbox/popup.h \
        openbox/prop.c \
        openbox/prop.h \
+       openbox/propwin.c \
+       openbox/propwin.h \
        openbox/resist.c \
        openbox/resist.h \
        openbox/screen.c \
@@ -247,28 +252,27 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
        tools/gnome-panel-control/gnome-panel-control.c
 
 
+## default button masks ##
+dist_docxbm_DATA = \
+        data/xbm/bullet.xbm \
+        data/xbm/close.xbm \
+        data/xbm/desk_toggled.xbm \
+        data/xbm/desk.xbm \
+        data/xbm/iconify.xbm \
+        data/xbm/max_toggled.xbm \
+        data/xbm/max.xbm \
+        data/xbm/shade_toggled.xbm \
+        data/xbm/shade.xbm
+
+
 ## themes ##
 
 clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
-       themes/Clearlooks/openbox-3/bullet.xbm \
-       themes/Clearlooks/openbox-3/close.xbm \
-       themes/Clearlooks/openbox-3/desk_toggled.xbm \
-       themes/Clearlooks/openbox-3/desk.xbm \
-       themes/Clearlooks/openbox-3/iconify.xbm \
-       themes/Clearlooks/openbox-3/max_toggled.xbm \
-       themes/Clearlooks/openbox-3/max.xbm \
        themes/Clearlooks/openbox-3/themerc.xml
 
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
-       themes/Clearlooks-Olive/openbox-3/bullet.xbm \
-       themes/Clearlooks-Olive/openbox-3/close.xbm \
-       themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \
-       themes/Clearlooks-Olive/openbox-3/desk.xbm \
-       themes/Clearlooks-Olive/openbox-3/iconify.xbm \
-       themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \
-       themes/Clearlooks-Olive/openbox-3/max.xbm \
        themes/Clearlooks-Olive/openbox-3/themerc.xml
 
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
@@ -286,25 +290,19 @@ dist_natura_theme_DATA= \
        themes/Natura/openbox-3/close_hover.xbm \
        themes/Natura/openbox-3/close.xbm \
        themes/Natura/openbox-3/desk_toggled.xbm \
+       themes/Natura/openbox-3/desk_hover.xbm \
        themes/Natura/openbox-3/desk.xbm \
-       themes/Natura/openbox-3/iconify_disabled.xbm \
        themes/Natura/openbox-3/iconify_hover.xbm \
        themes/Natura/openbox-3/iconify.xbm \
-       themes/Natura/openbox-3/max_disabled.xbm \
        themes/Natura/openbox-3/max_hover.xbm \
        themes/Natura/openbox-3/max_toggled.xbm \
        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
 
 artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-       themes/Artwiz-boxed/openbox-3/close.xbm \
-       themes/Artwiz-boxed/openbox-3/desk_toggled.xbm \
-       themes/Artwiz-boxed/openbox-3/desk.xbm \
-       themes/Artwiz-boxed/openbox-3/iconify.xbm \
-       themes/Artwiz-boxed/openbox-3/max_toggled.xbm \
-       themes/Artwiz-boxed/openbox-3/max.xbm \
        themes/Artwiz-boxed/openbox-3/themerc.xml
 
 bear2_themedir = $(themedir)/Bear2/openbox-3
@@ -313,10 +311,8 @@ dist_bear2_theme_DATA= \
        themes/Bear2/openbox-3/close.xbm \
        themes/Bear2/openbox-3/desk_toggled.xbm \
        themes/Bear2/openbox-3/desk.xbm \
-       themes/Bear2/openbox-3/iconify_disabled.xbm \
        themes/Bear2/openbox-3/iconify_pressed.xbm \
        themes/Bear2/openbox-3/iconify.xbm \
-       themes/Bear2/openbox-3/max_disabled.xbm \
        themes/Bear2/openbox-3/max_pressed.xbm \
        themes/Bear2/openbox-3/max_toggled.xbm \
        themes/Bear2/openbox-3/max.xbm \
@@ -330,17 +326,10 @@ dist_orang_theme_DATA= \
 
 syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
-       themes/Syscrash/openbox-3/bullet.xbm \
-       themes/Syscrash/openbox-3/close_disabled.xbm \
-       themes/Syscrash/openbox-3/close.xbm \
-       themes/Syscrash/openbox-3/desk_toggled.xbm \
-       themes/Syscrash/openbox-3/desk.xbm \
-       themes/Syscrash/openbox-3/iconify.xbm \
        themes/Syscrash/openbox-3/max_disabled.xbm \
        themes/Syscrash/openbox-3/max_pressed.xbm \
        themes/Syscrash/openbox-3/max_toggled.xbm \
        themes/Syscrash/openbox-3/max.xbm \
-       themes/Syscrash/openbox-3/shade.xbm \
        themes/Syscrash/openbox-3/themerc.xml
 
 ## public headers ##
@@ -369,29 +358,39 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
        data/openbox.png
 
-nodist_rc_DATA = \
+dist_rc_DATA = \
        data/rc.xml \
        data/menu.xml
 
-dist_xsd_DATA = \
-       data/rc.xsd \
-       data/menu.xsd
-
 edit = $(SED) \
+       -e 's!@time\@!`date`!' \
        -e 's!@version\@!$(VERSION)!' \
-       -e 's!@xsddir\@!$(xsddir)!'
+       -e 's!@bindir\@!$(bindir)!'
 
-data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data
+data/xsession/openbox-gnome-session: Makefile data \
+               $(srcdir)/data/xsession/openbox-gnome-session.in
        @echo make: creating $@
        @rm -f $@
        @mkdir data 2>/dev/null || true
-       @$(edit) $(srcdir)/data/rc.xml.in >$@
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
+       @chmod +x $@
 
-data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
+data/xsession/openbox-kde-session: Makefile data \
+               $(srcdir)/data/xsession/openbox-kde-session.in
        @echo make: creating $@
        @rm -f $@
        @mkdir data 2>/dev/null || true
-       @$(edit) $(srcdir)/data/menu.xml.in >$@
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
+       @chmod +x $@
+
+debian/changelog: debian debian/changelog.in
+       @echo make: creating $@
+       @rm -f $@
+       @mkdir debian 2>/dev/null || true
+       @$(edit) $(srcdir)/debian/changelog.in >$@
+       @chmod +x $@
 
 dist_gnomewmfiles_DATA = \
        data/gnome-wm-properties/openbox.desktop \
@@ -404,9 +403,27 @@ dist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
+       debian/changelog.in
+       debian/compat
+       debian/control
+       debian/copyright
+       debian/dirs
+       debian/docs
+       debian/menu.ex
+       debian/openbox-default.ex
+       debian/openbox.doc-base.EX
+       debian/postinst.ex
+       debian/postrm.ex
+       debian/preinst.ex
+       debian/prerm.ex
+       debian/rules
+       debian/watch.ex
        version.h.in \
-       data/rc.xml.in \
-       data/menu.xml.in \
+       data/rc.xsd \
+       data/menu.xsd \
+       data/themerc.xsd \
+       data/xsession/openbox-gnome-session.in \
+       data/xsession/openbox-kde-session.in \
        render/obrender-3.0.pc.in \
        parser/obparser-3.0.pc.in \
        tools/themeupdate/themeupdate.py \
@@ -427,18 +444,16 @@ dist_noinst_DATA = \
        tests/title.c \
        tests/urgent.c
 
-EXTRA_DIST = \
-       config.rpath \
-       mkinstalldirs \
-       CHANGELOG \
+dist_doc_DATA = \
        COMPLIANCE \
        README \
-       COPYING \
        AUTHORS
 
-CLEANFILES = \
-       data/rc.xml \
-       data/menu.xml
+EXTRA_DIST = \
+       config.rpath \
+       mkinstalldirs \
+       CHANGELOG \
+       COPYING
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
@@ -450,4 +465,8 @@ distclean-local:
                done \
        done
 
-.PHONY: doc
+deb:    dist debian/changelog
+       fakeroot debian/rules binary
+#        dpkg-buildpackage -rfakeroot
+
+.PHONY: doc deb
Openbox Window Manager