X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=826b0550c1c258adddc80319a53e823557994465;hb=5a44164be9c7171f7775f7a3f88fe4a1f93d9a1b;hp=036575297457cf5aedc71c3728dfb11d2bb2f895;hpb=a6532c3b2f00851db3aff05c381b308732350f86;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 03657529..826b0550 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,7 +91,6 @@ openbox_openbox_CPPFLAGS = \
 	$(SM_CFLAGS) \
 	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
@@ -105,7 +104,6 @@ openbox_openbox_LDADD = \
 	$(VIDMODE_LIBS) \
 	$(XSHAPE_LIBS) \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
@@ -148,6 +146,8 @@ openbox_openbox_SOURCES = \
 	openbox/keyboard.h \
 	openbox/keytree.c \
 	openbox/keytree.h \
+	openbox/mainloop.c \
+	openbox/mainloop.h \
 	openbox/menuframe.c \
 	openbox/menuframe.h \
 	openbox/menu.c \
@@ -176,8 +176,6 @@ openbox_openbox_SOURCES = \
 	openbox/stacking.h \
 	openbox/startup.c \
 	openbox/startup.h \
-	openbox/timer.c \
-	openbox/timer.h \
 	openbox/translate.c \
 	openbox/translate.h \
 	openbox/window.c \
@@ -192,7 +190,6 @@ tools_obconf_obconf_CPPFLAGS = \
 	$(GDK_PIXBUF_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DPLUGINDIR=\"$(plugindir)\" \
 	-DRCDIR=\"$(rcdir)\" \
 	-DPIXMAPDIR=\"$(pixmapdir)\" \
 	-DG_LOG_DOMAIN=\"Obconf\"
@@ -204,8 +201,7 @@ tools_obconf_obconf_LDADD = \
 	parser/libobparser.la
 tools_obconf_obconf_SOURCES = \
 	gettext.h \
-	tools/obconf/main.c \
-	plugins/obconf_interface.h
+	tools/obconf/main.c
 
 
 ## kdetrayproxy ##
@@ -220,58 +216,18 @@ tools_kdetrayproxy_kdetrayproxy_SOURCES = \
 
 ## themes ##
 
-thebear_themedir = $(themedir)/thebear
-dist_thebear_theme_DATA = \
-	themes/thebear/themerc
+allegro_themedir = $(themedir)/allegro
+dist_allegro_theme_DATA = \
+	themes/allegro/themerc \
+	themes/allegro/bullet.xbm
+
+artwiz_themedir = $(themedir)/artwiz
+dist_artwiz_theme_DATA = \
+	themes/artwiz/themerc
 
-planton_themedir = $(themedir)/planton
-dist_planton_theme_DATA = \
-	themes/planton/themerc \
-	themes/planton/max.xbm \
-	themes/planton/max_toggled.xbm \
-	themes/planton/desk.xbm \
-	themes/planton/desk_toggled.xbm \
-	themes/planton/shade.xbm \
-	themes/planton/shade_toggled.xbm \
-	themes/planton/iconify.xbm \
-	themes/planton/close.xbm
-
-lightindustry_themedir = $(themedir)/Light-Industry
-dist_lightindustry_theme_DATA = \
-	themes/Light-Industry/themerc \
-	themes/Light-Industry/max.xbm \
-	themes/Light-Industry/iconify.xbm \
-	themes/Light-Industry/close.xbm
-
-lightindustrybig_themedir = $(themedir)/Light-Industry-big
-dist_lightindustrybig_theme_DATA = \
-	themes/Light-Industry-big/themerc \
-	themes/Light-Industry-big/max.xbm \
-	themes/Light-Industry-big/iconify.xbm \
-	themes/Light-Industry-big/close.xbm
-
-imerry_themedir = $(themedir)/I-merry
-dist_imerry_theme_DATA = \
-	themes/I-merry/themerc \
-	themes/I-merry/max.xbm \
-	themes/I-merry/iconify.xbm \
-	themes/I-merry/close.xbm
-
-greenz_themedir = $(themedir)/greenz
-dist_greenz_theme_DATA = \
-	themes/greenz/themerc
-
-bbstyle_themedir = $(themedir)/BBstylE
-dist_bbstyle_theme_DATA = \
-	themes/BBstylE/themerc \
-	themes/BBstylE/max.xbm \
-	themes/BBstylE/max_toggled.xbm \
-	themes/BBstylE/desk.xbm \
-	themes/BBstylE/desk_toggled.xbm \
-	themes/BBstylE/shade.xbm \
-	themes/BBstylE/shade_toggled.xbm \
-	themes/BBstylE/iconify.xbm \
-	themes/BBstylE/close.xbm
+blah41_themedir = $(themedir)/blah41
+dist_blah41_theme_DATA = \
+	themes/blah41/themerc
 
 om4ob_themedir = $(themedir)/om4ob
 dist_om4ob_theme_DATA = \
@@ -294,12 +250,16 @@ dist_om4ob_theme_DATA = \
 	themes/om4ob/shade_toggled.xbm \
 	themes/om4ob/shade.xbm
 
+thebear_themedir = $(themedir)/thebear
+dist_thebear_theme_DATA = \
+	themes/thebear/themerc
+
 
 ## data ##
 
 dist_rc_DATA = \
-	data/rc3 \
-	data/menu
+	data/rc.xml \
+	data/menu.xml
 
 dist_desktopfiles_DATA = \
 	data/openbox.desktop