diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/.cvsignore | 9 | ||||
| -rw-r--r-- | openbox/Makefile | 4 | ||||
| -rw-r--r-- | openbox/Makefile.am | 54 | ||||
| -rw-r--r-- | openbox/openbox.c | 12 | ||||
| -rw-r--r-- | openbox/parse.h | 2 |
5 files changed, 13 insertions, 68 deletions
diff --git a/openbox/.cvsignore b/openbox/.cvsignore index 8d36eeca..736f5e94 100644 --- a/openbox/.cvsignore +++ b/openbox/.cvsignore @@ -1,9 +1,4 @@ openbox3 -Makefile.in -Makefile -.libs -.deps -lex.cparse.c -y.tab.c -y.tab.h lex.yy.c +parse.tab.c +parse.tab.h diff --git a/openbox/Makefile b/openbox/Makefile new file mode 100644 index 00000000..56263a4a --- /dev/null +++ b/openbox/Makefile @@ -0,0 +1,4 @@ +all clean distclean install uninstall: + $(MAKE) -$(MAKEFLAGS) -C .. $@ + +.PHONY: all clean distclean install uninstall diff --git a/openbox/Makefile.am b/openbox/Makefile.am deleted file mode 100644 index 9d8906fd..00000000 --- a/openbox/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -localedir=$(datadir)/locale -enginedir=$(libdir)/openbox/engines -plugindir=$(libdir)/openbox/plugins -rcdir=$(datadir)/openbox - -binary=openbox3 -url=http://icculus.org/openbox -bugurl=http://bugzilla.icculus.org - -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \ -@CPPFLAGS@ \ --DLOCALEDIR=\"$(localedir)\" \ --DRCDIR=\"$(rcdir)\" \ --DPLUGINDIR=\"$(plugindir)\" \ --DENGINEDIR=\"$(enginedir)\" \ --DDEFAULT_ENGINE=\"openbox\" \ --DG_LOG_DOMAIN=\"Openbox\" \ --DBINARY=\"$(binary)\" \ --DURL=\"$(url)\" \ --DBUGURL=\"$(bugurl)\" - -LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) @LIBS@ - -bin_PROGRAMS=$(binary) - -openbox3_LDADD=@LIBINTL@ ../render/librender.a -openbox3_LDFLAGS=-export-dynamic -openbox3_SOURCES=client.c event.c extensions.c focus.c frame.c openbox.c \ - prop.c screen.c stacking.c xerror.c timer.c dispatch.c \ - engine.c plugin.c action.c grab.c config.c menu.c \ - parse.tab.c lex.yy.c parse.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 dispatch.h \ - timer.h engine.h plugin.h action.h grab.h config.h menu.h parse.h \ - parse.tab.h - -lex.yy.c: parse.l - $(FLEX) $^ - -parse.h: parse.tab.h - -parse.tab.h:parse.tab.c - -parse.tab.c: parse.y - $(YACC) -d $< - -MAINTAINERCLEANFILES= Makefile.in - -clean-local: - $(RM) y.tab.c y.tab.h lex.yy.c - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/openbox/openbox.c b/openbox/openbox.c index a7357b2f..cd95a5d6 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -7,13 +7,13 @@ #include "screen.h" #include "focus.h" #include "extensions.h" -#include "gettext.h" #include "config.h" #include "parse.h" #include "grab.h" #include "engine.h" #include "plugin.h" #include "timer.h" +#include "gettext.h" #include "../render/render.h" #include "../render/font.h" @@ -69,9 +69,9 @@ int main(int argc, char **argv) /* initialize the locale */ if (!setlocale(LC_ALL, "")) g_warning("Couldn't set locale from environment.\n"); - bindtextdomain(PACKAGE, LOCALEDIR); - bind_textdomain_codeset(PACKAGE, "UTF-8"); - textdomain(PACKAGE); + bindtextdomain(PACKAGE_NAME, LOCALEDIR); + bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); + textdomain(PACKAGE_NAME); /* start our event dispatcher and register for signals */ dispatch_startup(); @@ -256,7 +256,7 @@ void signal_handler(const ObEvent *e, void *data) void print_version() { - g_print("Openbox %s\n\n", VERSION); + g_print("Openbox %s\n\n", PACKAGE_VERSION); g_print("This program comes with ABSOLUTELY NO WARRANTY.\n"); g_print("This is free software, and you are welcome to redistribute it\n"); g_print("under certain conditions. See the file COPYING for details.\n\n"); @@ -272,7 +272,7 @@ void print_help() g_print(" -version Display the version and exit\n"); g_print(" -sync Run in synchronous mode (this is slow and meant\n" " for debugging X routines)\n"); - g_print("\nPlease report bugs at %s\n", BUGURL); + g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT); } void parse_args(int argc, char **argv) diff --git a/openbox/parse.h b/openbox/parse.h index 1b72667d..a267757c 100644 --- a/openbox/parse.h +++ b/openbox/parse.h @@ -2,7 +2,7 @@ #define __parse_h #include <glib.h> -#include "y.tab.h" +#include "parse.tab.h" typedef enum { TOKEN_REAL, |