X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=adc06bf8f2cf464e89179a5db443fca75249c20c;hb=05a850b88e148469bfe2b996883789054fd1acbc;hp=e8fb3f2eb9f52f3a77a50528a8817598d2d94e23;hpb=359ef290827532b6dcc365032de3f26699812c9c;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index e8fb3f2e..adc06bf8 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,39 +1,44 @@
 localedir=$(datadir)/locale
-themercdir=$(datadir)/openbox
-enginedir=$(libdir)/openbox/engines
+rcdir=$(datadir)/openbox
 plugindir=$(libdir)/openbox/plugins
+desktopfilesdir=$(datadir)/gnome/wm-properties
 
-binary=openbox3
-url=http://icculus.org/openbox
-bugurl=http://bugzilla.icculus.org
+binary=openbox
+url=http://openbox.org/
 
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
-@CPPFLAGS@ \
--DLOCALEDIR=\"$(localedir)\" \
--DTHEMERCDIR=\"$(themercdir)\" \
--DPLUGINDIR=\"$(plugindir)\" \
--DENGINEDIR=\"$(enginedir)\" \
--DDEFAULT_ENGINE=\"openbox\" \
--DG_LOG_DOMAIN=\"Openbox\" \
--DBINARY=\"$(binary)\" \
--DURL=\"$(url)\" \
--DBUGURL=\"$(bugurl)\"
+CPPFLAGS=$(X_CFLAGS) $(SM_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) \
+         $(GMODULE_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) \
+         @CPPFLAGS@ \
+         -DLOCALEDIR=\"$(localedir)\" \
+         -DPLUGINDIR=\"$(plugindir)\" \
+         -DRCDIR=\"$(rcdir)\" \
+         -DG_LOG_DOMAIN=\"Openbox\" \
+         -DBINARY=\"$(binary)\"
 
-LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) @LIBS@
+INCLUDES=-I..
+LIBS=$(X_LIBS) $(SM_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(XKB_LIBS) \
+	$(XRANDR_LIBS) $(VIDMODE_LIBS) $(XSHAPE_LIBS) $(GLIB_LIBS) \
+	$(GMODULE_LIBS) $(LIBSN_LIBS) $(XML_LIBS) @LIBS@ @LIBINTL@
 
 bin_PROGRAMS=$(binary)
 
-ob3_LDADD=@LIBINTL@ ../render/librender.a
-ob3_LDFLAGS=-export-dynamic
-ob3_SOURCES=client.c event.c extensions.c focus.c frame.c openbox.c prop.c \
-	screen.c stacking.c xerror.c themerc.c timer.c dispatch.c \
-	engine.c plugin.c action.c grab.c
+openbox_LDADD=-lobrender -L../render -lobparser -L../parser
+openbox_LDFLAGS=-export-dynamic
+openbox_SOURCES=action.c client.c config.c \
+                extensions.c focus.c frame.c grab.c menu.c menu_render.c \
+                openbox.c framerender.c plugin.c prop.c screen.c \
+                stacking.c dispatch.c event.c group.c timer.c xerror.c \
+                moveresize.c startup.c popup.c dock.c window.c
 
-noinst_HEADERS=client.h event.h extensions.h focus.h frame.h geom.h gettext.h \
-	openbox.h prop.h screen.h stacking.h xerror.h themerc.h dispatch.h \
-	timer.h engine.h plugin.h action.h grab.h
+noinst_HEADERS=action.h client.h config.h dispatch.h event.h extensions.h \
+               focus.h frame.h framerender.h geom.h gettext.h grab.h group.h \
+               menu.h openbox.h plugin.h prop.h screen.h \
+               stacking.h timer.h xerror.h moveresize.h startup.h popup.h \
+               dock.h window.h
 
-MAINTAINERCLEANFILES= Makefile.in
+desktopfiles_DATA=openbox.desktop
+
+MAINTAINERCLEANFILES=Makefile.in
 
 distclean-local:
 	$(RM) *\~ *.orig *.rej .\#*