X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=5d4637284fa69044fcacfcd863bafc00af4e06bb;hb=33c469f4535a6b92917539feae189945a777da68;hp=f1b1b9f84bde898728d05893ec12982fa9ad4963;hpb=ec304c9e433e4b1cedf924ca64d783f05db7d42d;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index f1b1b9f8..5d463728 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
-userscriptdir   = $(datadir)/openbox
 
 theme = bear2
 
@@ -106,6 +105,7 @@ parser_libobparser_la_SOURCES = \
 
 openbox_openbox_CPPFLAGS = \
 	$(X_CFLAGS) \
+	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
 	$(PANGO_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -123,6 +123,7 @@ openbox_openbox_LDADD = \
 	$(XSHAPE_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
+	$(XCURSOR_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
@@ -137,6 +138,7 @@ openbox_openbox_SOURCES = \
 	openbox/client.c \
 	openbox/client.h \
 	openbox/client_list_menu.c \
+	openbox/client_list_menu.h \
 	openbox/client_list_combined_menu.c \
 	openbox/client_list_combined_menu.h \
 	openbox/client_menu.c \
@@ -216,7 +218,6 @@ tools_themetoxml_themetoxml_LDADD = \
 	$(XML_LIBS)
 tools_themetoxml_themetoxml_SOURCES = \
 	tools/themetoxml/themetoxml.c \
-	tools/themetoxml/themetoxml.h \
 	tools/themetoxml/rgb.h
 
 
@@ -355,16 +356,11 @@ data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
 	@mkdir data 2>/dev/null || true
 	@$(edit) $(srcdir)/data/menu.xml.in >$@
 
-dist_userscript_DATA = \
-	tools/themeupdate/themeupdate.py
-
-install-data-hook:
-	chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py
-
 dist_desktopfiles_DATA = \
 	data/openbox.desktop
 
 dist_noinst_DATA = \
+	tools/themeupdate/themeupdate.py \
 	version.h.in \
 	data/rc.xml.in \
 	data/menu.xml.in \