X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=8384451827ac83acc49073e24d4420f081cb80bb;hb=26ff0cbaa8cfb004d7486b10795193c15d1d6da0;hp=553fcb923914bf5dd950459482f797678b80fcfc;hpb=3bee91aaf9c9893fb4a516432ad195a117baf1ce;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 553fcb92..83844518 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ noinst_PROGRAMS = \
 
 render_rendertest_CPPFLAGS = \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -49,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
@@ -58,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 = \
@@ -66,6 +69,7 @@ render_libobrender_la_LIBADD = \
 	parser/libobparser.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -356,34 +360,53 @@ dist_pixmap_DATA = \
 
 dist_rc_DATA = \
 	data/rc.xml \
+	data/rc-gnome.xml \
+	data/rc-kde.xml \
 	data/menu.xml
 
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
+	-e 's!@configdir\@!$(configdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome-session: Makefile data \
+data/xsession/openbox-gnome-session: \
 		$(srcdir)/data/xsession/openbox-gnome-session.in
 	@echo make: creating $@
-	@rm -f $@
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
-	@chmod +x $@
+	@$(edit) $< >$@
+	@chmod a+x $@
 
-data/xsession/openbox-kde-session: Makefile data \
+data/xsession/openbox-kde-session: \
 		$(srcdir)/data/xsession/openbox-kde-session.in
 	@echo make: creating $@
-	@rm -f $@
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
-	@chmod +x $@
+	@$(edit) $< >$@
+	@chmod a+x $@
+
+doc/openbox.1.in: $(srcdir)/doc/openbox.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
+
+doc/openbox.1: doc/openbox.1.in
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@$(edit) $< >$@
+
+doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
+
+doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
 
 dist_gnomewmfiles_DATA = \
-	data/gnome-wm-properties/openbox.desktop \
-	data/gnome-wm-properties/openbox-gnome.desktop \
-	data/gnome-wm-properties/openbox-kde.desktop
+	data/gnome-wm-properties/openbox.desktop
 
 dist_xsessions_DATA = \
 	data/xsession/openbox.desktop \
@@ -391,6 +414,15 @@ dist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
+	debian/changelog.in \
+	debian/compat \
+	debian/conffiles \
+	debian/control \
+	debian/copyright \
+	debian/menu \
+	debian/postinst \
+	debian/postrm \
+	debian/rules \
 	version.h.in \
 	data/rc.xsd \
 	data/menu.xsd \
@@ -420,7 +452,16 @@ dist_noinst_DATA = \
 dist_doc_DATA = \
 	COMPLIANCE \
 	README \
-	AUTHORS
+	AUTHORS \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd \
+	doc/rc-mouse-focus.xml
+
+dist_man_MANS = \
+	doc/openbox.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1
 
 EXTRA_DIST = \
 	config.rpath \