X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=7d1ec7ec60fcef4c19a1899419381b63059a84ca;hb=84a60ebbfbdf9deea446c35c53f8703edeb8213d;hp=96f3cb19362956ec80b6019f6843947fa441408c;hpb=d618c3bc9911ece882761f196ed1685caa200271;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 96f3cb19..7d1ec7ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ themedir        = $(datadir)/openbox/themes
 localedir       = $(datadir)/locale
 rcdir           = $(datadir)/openbox
 desktopfilesdir = $(datadir)/gnome/wm-properties
-pixmapdir       = $(datadir)/pixmaps
+pkgconfigdir    = $(libdir)/pkgconfig
+pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 
 theme = thebear
 
@@ -24,11 +25,6 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/kdetrayproxy/kdetrayproxy
 
-if OBCONF
-bin_PROGRAMS += \
-	tools/obconf/obconf
-endif
-
 ## render ##
 
 render_rendertest_CPPFLAGS = \
@@ -174,8 +170,8 @@ openbox_openbox_SOURCES = \
 	openbox/session.h \
 	openbox/stacking.c \
 	openbox/stacking.h \
-	openbox/startup.c \
-	openbox/startup.h \
+	openbox/startupnotify.c \
+	openbox/startupnotify.h \
 	openbox/translate.c \
 	openbox/translate.h \
 	openbox/window.c \
@@ -183,26 +179,6 @@ openbox_openbox_SOURCES = \
 	openbox/xerror.c \
 	openbox/xerror.h
 
-## obconf ##
-
-tools_obconf_obconf_CPPFLAGS = \
-	$(GTK_CFLAGS) \
-	$(GDK_PIXBUF_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-DRCDIR=\"$(rcdir)\" \
-	-DPIXMAPDIR=\"$(pixmapdir)\" \
-	-DG_LOG_DOMAIN=\"Obconf\"
-tools_obconf_obconf_LDADD = \
-	$(GTK_LIBS) \
-	$(GDK_PIXBUF_LIBS) \
-	$(LIBINTL) \
-	render/libobrender.la \
-	parser/libobparser.la
-tools_obconf_obconf_SOURCES = \
-	gettext.h \
-	tools/obconf/main.c
-
 
 ## kdetrayproxy ##
 
@@ -255,15 +231,29 @@ dist_thebear_theme_DATA = \
 	themes/thebear/themerc
 
 
+## public headers ##
+
+pubinclude_HEADERS = \
+	render/render.h \
+	render/theme.h \
+	parser/parse.h
+
+nodist_pkgconfig_DATA = \
+	render/obrender-3.0.pc \
+	parser/obparser-3.0.pc
+
 ## data ##
 
 dist_rc_DATA = \
-	data/rc3 \
-	data/menu
+	data/rc.xml \
+	data/menu.xml
 
 dist_desktopfiles_DATA = \
 	data/openbox.desktop
 
+dist_noinst_DATA = \
+	tools/themeupdate/themeupdate.py
+
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \