From: Dana Jansens Date: Thu, 3 Apr 2003 05:59:03 +0000 (+0000) Subject: new build system without automake X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=d447dc0f59619d26073699d9f81d7de77c200be4;p=chaz%2Fopenbox new build system without automake --- diff --git a/.cvsignore b/.cvsignore index a285411c..e69de29b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,26 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -config.cache -config.h -config.h.in -config.log -config.status -configure -stamp-h -stamp-h.in -version.h -stamp-h1 -autom4te.cache -libtool -config.sub -config.guess -ltmain.sh -mkinstalldirs -missing -install-sh -depcomp -config.rpath -py-compile -ABOUT-NLS -compile diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..b018e9f6 --- /dev/null +++ b/Makefile @@ -0,0 +1,29 @@ +include build/Makefile.incl + +depdir:=.deps + +all: alltargets + +include build/Makefile.render +include build/Makefile.kernel +include build/Makefile.themes +include build/Makefile.plugins +include build/Makefile.engines + +alltargets: $(kernel_target) $(plugins_targets) $(engines_targets) + +install: all render-install kernel-install themes-install plugins-install engines-install + +uninstall: render-uninstall kernel-uninstall themes-uninstall plugins-uninstall engines-uninstall + +clean: render-clean kernel-clean plugins-clean engines-clean + $(RM) *\~ + +distclean: clean + $(RM) configure Makefile.incl + $(RM) -r .deps/ + +$(depdir): + @mkdir $@ + +.PHONY: all clean distclean diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index be66ed9a..00000000 --- a/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -SUBDIRS = po data themes doc render kernel engines plugins -MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in - -.PHONY: doc - -doc: - $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc - -distclean-local: - rm -f *\~ gmon.out .\#* - -ACLOCAL_AMFLAGS = -I m4 - -EXTRA_DIST = config.rpath mkinstalldirs INSTALL README \ - COPYING AUTHORS CHANGELOG diff --git a/bootstrap b/bootstrap index 288bd69b..cd4e11c4 100755 --- a/bootstrap +++ b/bootstrap @@ -9,7 +9,7 @@ sh libtoolize --copy --force --automake sh aclocal -I m4 #sh autoheader sh autoconf -sh automake --foreign --include-deps --add-missing --copy +#sh automake --foreign --include-deps --add-missing --copy echo echo You are now ready to run ./configure diff --git a/build/.cvsignore b/build/.cvsignore new file mode 100644 index 00000000..848f07ea --- /dev/null +++ b/build/.cvsignore @@ -0,0 +1 @@ +Makefile.incl diff --git a/build/Makefile.engines b/build/Makefile.engines new file mode 100644 index 00000000..6da55546 --- /dev/null +++ b/build/Makefile.engines @@ -0,0 +1,60 @@ +engines_dir:=engines +engines_srcdir:=$(srcdir)/$(engines_dir) +engines_depdir:=$(depdir)/$(engines_dir) + +engines_ob_dir:=$(engines_dir)/openbox +engines_ob_srcdir:=$(engines_srcdir)/openbox +engines_ob_target:=openbox.la +engines_ob_sources:=obengine.c obtheme.c obrender.c +engines_ob_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(XFT_CFLAGS) \ + -DG_LOG_DOMAIN=\"Engine-Openbox\" \ + -DTHEMEDIR=\"$(themesdir)/openbox\" \ + -DDEFAULT_THEME=\"operation\" + +engines_targets:=$(engines_ob_dir)/$(engines_ob_target) + +engines_ob_objects:=$(addprefix $(engines_ob_dir)/,$(engines_ob_sources:.c=.lo)) +engines_ob_sources:=$(addprefix $(engines_ob_srcdir)/,$(engines_ob_sources)) +engines_ob_target:=$(addprefix $(engines_ob_dir)/,$(engines_ob_target)) +engines_ob_deps:=$(addprefix $(depdir)/,$(engines_ob_objects:.lo=.d)) +engines_ob_depdir:=$(depdir)/$(engines_ob_dir) + +## engines_ob + +$(engines_ob_target): $(engines_ob_objects) + $(LIBTOOL) --mode=link $(CC) -rpath $(enginedir) $(engines_ob_CPPFLAGS) \ + $(CFLAGS) -module -avoid-version -o $@ $^ + +$(engines_ob_dir): + @mkdir $@ + +$(engines_ob_dir)/%.lo: $(engines_ob_srcdir)/%.c $(engines_ob_depdir)/%.d + $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(engines_ob_CPPFLAGS) $(CFLAGS) -c -o $@ $< + +$(engines_ob_depdir)/%.d: $(engines_ob_srcdir)/%.c $(depdir) + @echo Building dependancies for $< + @mkdir $(engines_depdir) 2> /dev/null || true + @mkdir $(dir $@) 2> /dev/null || true + @$(CC) $(engines_ob_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $< + +## end engines_ob + +engines-install: + $(INSTALL) -d $(DESTDIR)$(enginedir)/ + $(LIBTOOL) --mode=install $(INSTALL) $(engines_ob_target) \ + $(DESTDIR)$(enginedir)/$(notdir $(engines_ob_target)) + $(LIBTOOL) --mode=finish $(DESTDIR)$(enginedir) + +engines-uninstall: + $(LIBTOOL) --mode=uninstall $(RM) \ + $(DESTDIR)$(enginedir)/$(notdir $(engines_ob_target)) + -rmdir $(DESTDIR)$(enginedir)/ + +engines-clean: + $(RM) $(engines_ob_target) $(engines_ob_objects) + $(RM) $(engines_ob_dir)/*\~ + +-include $(engines_ob_deps) + +.PHONY: engines-install engines-uninstall engines-clean diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in new file mode 100644 index 00000000..6bdf7082 --- /dev/null +++ b/build/Makefile.incl.in @@ -0,0 +1,44 @@ +CFLAGS = @CFLAGS@ +CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ \ + -DLOCALEDIR=\"$(localedir)\" \ + -DRCDIR=\"$(rcdir)\" \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DENGINEDIR=\"$(enginedir)\" \ + -DDEFAULT_ENGINE=\"openbox\" \ + -DBINARY=\"$(binary)\" +DEFS = @DEFS@ +LIBS = @LIBS@ + +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED + +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ -DG_DISABLE_DEPRECATED + +XFT_CFLAGS = @XFT_CFLAGS@ +XFT_LIBS = @XFT_LIBS@ + +FLEX = @FLEX@ +BISON = @BISON@ +INSTALL = @INSTALL@ +LIBTOOL = @LIBTOOL@ + +srcdir = @srcdir@ +# non-recursive! +top_builddir = . + +prefix ?= @prefix@ +exec_prefix ?= @exec_prefix@ + +bindir ?= @bindir@ +libdir ?= @libdir@ +includedir ?= @includedir@ +datadir ?= @datadir@ + +localedir = $(datadir)/locale +enginedir = $(libdir)/openbox/engines +plugindir = $(libdir)/openbox/plugins +rcdir = $(datadir)/openbox +themesdir = $(datadir)/openbox/themes + +binary = openbox3 diff --git a/build/Makefile.kernel b/build/Makefile.kernel new file mode 100644 index 00000000..10a8268e --- /dev/null +++ b/build/Makefile.kernel @@ -0,0 +1,62 @@ +kernel_dir:=kernel +kernel_target:=$(binary) +kernel_sources:=action.c client.c config.c dispatch.c engine.c event.c \ + extensions.c focus.c frame.c grab.c menu.c openbox.c \ + parse.c plugin.c prop.c screen.c stacking.c timer.c xerror.c \ + lex.yy.c parse.tab.c +kernel_lex:=parse.l +kernel_yacc:=parse.y +kernel_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \ + -DG_LOG_DOMAIN=\"Openbox\" +kernel_LIBS:=$(LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) +kernel_LDFLAGS:=-export-dynamic + +kernel_srcdir:=$(srcdir)/$(kernel_dir) +kernel_lex:=$(addprefix $(kernel_srcdir)/,$(kernel_lex)) +kernel_yacc:=$(addprefix $(kernel_srcdir)/,$(kernel_yacc)) +kernel_target:=$(addprefix $(kernel_dir)/,$(kernel_target)) +kernel_objects:=$(addprefix $(kernel_dir)/,$(kernel_sources:.c=.o)) +kernel_sources:=$(addprefix $(kernel_srcdir)/,$(kernel_sources)) +kernel_deps:=$(addprefix $(depdir)/,$(kernel_objects:.o=.d)) +kernel_depdir:=$(depdir)/$(kernel_dir) + +$(kernel_target): $(kernel_objects) $(render_target) + $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(kernel_LIBS) $(kernel_LDFLAGS) + +$(kernel_dir): + @mkdir $@ + +$(kernel_dir)/%.o: $(kernel_srcdir)/%.c $(kernel_depdir)/%.d + $(CC) $(DEFS) $(kernel_CPPFLAGS) $(CFLAGS) -c -o $@ $< + +$(kernel_dir)/lex.yy.c: $(kernel_lex) + cd kernel && \ + $(FLEX) $(notdir $<) + +%.tab.h: %.tab.c + +$(kernel_dir)/%.tab.c: $(kernel_srcdir)/%.y + cd kernel && \ + $(BISON) -d $(notdir $<) + +$(kernel_depdir)/%.d: $(kernel_srcdir)/%.c $(depdir) + @echo Building dependancies for $< + @mkdir $(dir $@) 2> /dev/null || true + @$(CC) $(kernel_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.o) $< + +kernel-install: + $(INSTALL) -d $(DESTDIR)$(bindir)/ + $(INSTALL) $(kernel_target) $(DESTDIR)$(bindir)/$(notdir $(kernel_target)) + +kernel-uninstall: + -$(RM) $(DESTDIR)$(bindir)/$(notdir $(kernel_target)) + -rmdir $(DESTDIR)$(bindir)/ + +kernel-clean: + $(RM) $(kernel_target) $(kernel_objects) $(kernel_dir)/*\~ + $(RM) $(kernel_srcdir)/lex.yy.c + $(RM) $(kernel_yacc:.y=.tab.c) $(kernel_yacc:.y=.tab.h) + +-include $(kernel_deps) + +.PHONY: kernel-install kernel-uninstall kernel-clean diff --git a/build/Makefile.plugins b/build/Makefile.plugins new file mode 100644 index 00000000..ba23c556 --- /dev/null +++ b/build/Makefile.plugins @@ -0,0 +1,96 @@ +plugins_dir:=plugins +plugins_srcdir:=$(srcdir)/$(plugins_dir) + +plugins_resistance_dir:=$(plugins_dir) +plugins_resistance_srcdir:=$(plugins_srcdir) +plugins_resistance_target:=resistance.la +plugins_resistance_sources:=resistance.c +plugins_resistance_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(XFT_CFLAGS) \ + -DG_LOG_DOMAIN=\"Plugin-Resistance\" + +plugins_placement_dir:=$(plugins_dir)/placement +plugins_placement_srcdir:=$(plugins_srcdir)/placement +plugins_placement_target:=placement.la +plugins_placement_sources:=placement.c history.c +plugins_placement_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(XFT_CFLAGS) \ + -DG_LOG_DOMAIN=\"Plugin-Placement\" + +plugins_targets:=$(plugins_resistance_dir)/$(plugins_resistance_target) +plugins_targets:=$(plugins_targets) $(plugins_placement_dir)/$(plugins_placement_target) + +plugins_resistance_objects:=$(addprefix $(plugins_resistance_dir)/,$(plugins_resistance_sources:.c=.lo)) +plugins_resistance_sources:=$(addprefix $(plugins_resistance_srcdir)/,$(plugins_resistance_sources)) +plugins_resistance_target:=$(addprefix $(plugins_resistance_dir)/,$(plugins_resistance_target)) +plugins_resistance_deps:=$(addprefix $(depdir)/,$(plugins_resistance_objects:.lo=.d)) +plugins_resistance_depdir:=$(depdir)/$(plugins_resistance_dir) + +plugins_placement_objects:=$(addprefix $(plugins_placement_dir)/,$(plugins_placement_sources:.c=.lo)) +plugins_placement_sources:=$(addprefix $(plugins_placement_srcdir)/,$(plugins_placement_sources)) +plugins_placement_target:=$(addprefix $(plugins_placement_dir)/,$(plugins_placement_target)) +plugins_placement_deps:=$(addprefix $(depdir)/,$(plugins_placement_objects:.lo=.d)) +plugins_placement_depdir:=$(depdir)/$(plugins_placement_dir) + +## plugins_resistance + +$(plugins_resistance_target): $(plugins_resistance_objects) + $(LIBTOOL) --mode=link $(CC) -rpath $(plugindir) $(plugins_resistance_CPPFLAGS) \ + $(CFLAGS) -module -avoid-version -o $@ $^ + +$(plugins_resistance_dir): + @mkdir $@ + +$(plugins_resistance_dir)/%.lo: $(plugins_resistance_srcdir)/%.c $(plugins_resistance_depdir)/%.d + $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(plugins_resistance_CPPFLAGS) $(CFLAGS) -c -o $@ $< + +$(plugins_resistance_depdir)/%.d: $(plugins_resistance_srcdir)/%.c $(depdir) + @echo Building dependancies for $< + @mkdir $(dir $@) 2> /dev/null || true + @$(CC) $(plugins_resistance_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $< + +## end plugins_resistance + +## plugins_placement + +$(plugins_placement_target): $(plugins_placement_objects) + $(LIBTOOL) --mode=link $(CC) -rpath $(plugindir) $(plugins_placement_CPPFLAGS) \ + $(CFLAGS) -module -avoid-version -o $@ $^ + +$(plugins_placement_dir): + @mkdir $@ + +$(plugins_placement_dir)/%.lo: $(plugins_placement_srcdir)/%.c $(plugins_placement_depdir)/%.d + $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(plugins_placement_CPPFLAGS) $(CFLAGS) -c -o $@ $< + +$(plugins_placement_depdir)/%.d: $(plugins_placement_srcdir)/%.c $(depdir) + @echo Building dependancies for $< + @mkdir $(dir $@) 2> /dev/null || true + @$(CC) $(plugins_placement_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $< + +## end plugins_placement + +plugins-install: + $(INSTALL) -d $(DESTDIR)$(plugindir)/ + $(LIBTOOL) --mode=install $(INSTALL) $(plugins_resistance_target) \ + $(DESTDIR)$(plugindir)/$(notdir $(plugins_resistance_target)) + $(LIBTOOL) --mode=install $(INSTALL) $(plugins_placement_target) \ + $(DESTDIR)$(plugindir)/$(notdir $(plugins_placement_target)) + $(LIBTOOL) --mode=finish $(DESTDIR)$(plugindir) + +plugins-uninstall: + $(LIBTOOL) --mode=uninstall $(RM) \ + $(DESTDIR)$(plugindir)/$(notdir $(plugins_placement_target)) + $(LIBTOOL) --mode=uninstall $(RM) \ + $(DESTDIR)$(plugindir)/$(notdir $(plugins_resistance_target)) + -rmdir $(DESTDIR)$(plugindir)/ + +plugins-clean: + $(RM) $(plugins_resistance_target) $(plugins_resistance_objects) + $(RM) $(plugins_resistance_dir)/*\~ + $(RM) $(plugins_placement_target) $(plugins_placement_objects) + $(RM) $(plugins_placement_dir)/*\~ + +-include $(plugins_resistance_deps) $(plugins_placement_deps) + +.PHONY: plugins-install plugins-uninstall plugins-clean diff --git a/build/Makefile.render b/build/Makefile.render new file mode 100644 index 00000000..210ecdd9 --- /dev/null +++ b/build/Makefile.render @@ -0,0 +1,37 @@ +render_dir:=render +render_target:=librender.a +render_sources:=color.c font.c gradient.c image.c mask.c render.c test.c +render_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(XFT_CFLAGS) \ + -DG_LOG_DOMAIN=\"Render\" + +render_srcdir:=$(srcdir)/$(render_dir) +render_target:=$(addprefix $(render_dir)/,$(render_target)) +render_objects:=$(addprefix $(render_dir)/,$(render_sources:.c=.o)) +render_sources:=$(addprefix $(render_srcdir)/,$(render_sources)) +render_deps:=$(addprefix $(depdir)/,$(render_objects:.o=.d)) +render_depdir:=$(depdir)/$(render_dir) + +$(render_target): $(render_objects) + $(AR) r $@ $^ + +$(render_dir): + @mkdir $@ + +$(render_dir)/%.o: $(render_srcdir)/%.c $(depdir)/%.d + $(CC) $(DEFS) $(render_CPPFLAGS) $(CFLAGS) -c -o $@ $< + +$(render_depdir)/%.d: $(render_srcdir)/%.c $(render_depdir) + @echo Building dependancies for $< + @mkdir $(dir $@) 2> /dev/null || true + @$(CC) $(render_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.o) $< + +render-install: + +render-uninstall: + +render-clean: + $(RM) $(render_target) $(render_objects) $(render_srcdir)/*\~ + +-include $(render_deps) + +.PHONY: render-install render-uninstall render-clean diff --git a/build/Makefile.themes b/build/Makefile.themes new file mode 100644 index 00000000..5238c140 --- /dev/null +++ b/build/Makefile.themes @@ -0,0 +1,60 @@ +themes_srcdir:=$(srcdir)/themes + +themes_ob_dir:=$(DESTDIR)$(themesdir)/openbox +themes_ob_srcdir:=$(themes_srcdir)/openbox +themes_ob:=artwiz bbs bluebox cthulhain deep ebox fieron fieron2 flux \ + frobozz frobust mbdtex miklos nyz nyzclone ob20 operation \ + outcomes paper purplehaaze shade steelblue steelblue2 \ + the_orange trisb twice warp-xp + +themes_ob_fieron_buttons_dir:=$(themes_ob_dir)/fieron_buttons +themes_ob_fieron_buttons_srcdir:=$(themes_ob_srcdir)/fieron_buttons +themes_ob_fieron_buttons:=close.xbm icon.xbm max.xbm stick.xbm + +themes_ob_fieron2_buttons_dir:=$(themes_ob_dir)/fieron2_buttons +themes_ob_fieron2_buttons_srcdir:=$(themes_ob_srcdir)/fieron2_buttons +themes_ob_fieron2_buttons:=close.xbm icon.xbm max.xbm stick.xbm + +themes_ob_ebox_buttons_dir:=$(themes_ob_dir)/ebox_buttons +themes_ob_ebox_buttons_srcdir:=$(themes_ob_srcdir)/ebox_buttons +themes_ob_ebox_buttons:=close.xbm icon.xbm max.xbm + +themes-install: + $(INSTALL) -d $(DESTDIR)$(themesdir) + + $(INSTALL) -d $(themes_ob_dir) + for i in $(addprefix $(themes_ob_srcdir)/,$(themes_ob)); do \ + $(INSTALL) $$i $(themes_ob_dir); \ + done + $(INSTALL) -d $(themes_ob_fieron_buttons_dir) + for i in $(addprefix $(themes_ob_fieron_buttons_srcdir)/,$(themes_ob_fieron_buttons)); do \ + $(INSTALL) $$i $(themes_ob_fieron_buttons_dir); \ + done + $(INSTALL) -d $(themes_ob_fieron2_buttons_dir) + for i in $(addprefix $(themes_ob_fieron2_buttons_srcdir)/,$(themes_ob_fieron2_buttons)); do \ + $(INSTALL) $$i $(themes_ob_fieron2_buttons_dir); \ + done + $(INSTALL) -d $(themes_ob_ebox_buttons_dir) + for i in $(addprefix $(themes_ob_ebox_buttons_srcdir)/,$(themes_ob_ebox_buttons)); do \ + $(INSTALL) $$i $(themes_ob_ebox_buttons_dir); \ + done + +themes-uninstall: + -for i in $(themes_ob_ebox_buttons); do \ + $(RM) $(themes_ob_ebox_buttons_dir)/$$i; \ + done + -rmdir $(themes_ob_ebox_buttons_dir) + -for i in $(themes_ob_fieron2_buttons); do \ + $(RM) $(themes_ob_fieron2_buttons_dir)/$$i; \ + done + -rmdir $(themes_ob_fieron2_buttons_dir) + -for i in $(themes_ob_fieron_buttons); do \ + $(RM) $(themes_ob_fieron_buttons_dir)/$$i; \ + done + -rmdir $(themes_ob_fieron_buttons_dir) + -for i in $(themes_ob); do \ + $(RM) $(themes_ob_dir)/$$i; \ + done + -rmdir $(themes_ob_dir) + + -rmdir $(DESTDIR)$(themesdir) diff --git a/configure.ac b/configure.ac index f322e626..e5069b2c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,22 +1,19 @@ AC_PREREQ([2.50]) -AC_INIT([kernel/openbox.c]) +AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org]) # AC_CONFIG_HEADERS(config.h) AC_LANG([C]) AC_ENABLE_STATIC([no]) AC_ENABLE_SHARED([yes]) AC_PREFIX_DEFAULT([/usr/local]) -if test "$prefix" = "NONE"; then - prefix=$ac_default_prefix - ac_configure_args="$ac_configure_args --prefix $prefix" -fi +test "$prefix" = "NONE" && prefix=$ac_default_prefix -AM_INIT_AUTOMAKE([openbox], [2.90.0cvs]) +##AM_INIT_AUTOMAKE([openbox], [2.90.0cvs]) AC_PATH_PROG([SED], [sed]) test "$SED" || AC_MSG_ERROR([sed not found]) -AM_MAINTAINER_MODE +##AM_MAINTAINER_MODE # Determine build target OB_DEBUG # Pick compiler specific/build target flags, and set $CVS @@ -35,16 +32,16 @@ AC_SUBST(GMODULE_LIBS) AC_PATH_PROG([FLEX], [flex]) test "$FLEX" || AC_MSG_ERROR([flex not found]) -AC_PATH_PROG([YACC], [bison]) -test "YACC" || AC_MSG_ERROR([yacc not found]) +AC_PATH_PROG([BISON], [bison]) +test "BISON" || AC_MSG_ERROR([bison not found]) AC_PROG_LIBTOOL LIBTOOL="$LIBTOOL --silent" AC_PROG_INSTALL -ALL_LINGUAS="" -AM_GNU_GETTEXT_VERSION(0.11.5) -AM_GNU_GETTEXT([external]) +##ALL_LINGUAS="" +##AM_GNU_GETTEXT_VERSION(0.11.5) +##AM_GNU_GETTEXT([external]) AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h) AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h) @@ -60,21 +57,22 @@ X11_EXT_XKB X11_EXT_SHAPE X11_EXT_XINERAMA -AC_CONFIG_FILES([Makefile po/Makefile.in - kernel/Makefile - render/Makefile - engines/Makefile - engines/openbox/Makefile - plugins/Makefile - plugins/keyboard/Makefile - plugins/mouse/Makefile - plugins/placement/Makefile - doc/Makefile - doc/doxygen/Makefile - data/Makefile - data/buttons/Makefile - themes/Makefile - themes/openbox/Makefile]) +AC_CONFIG_FILES([build/Makefile.incl]) +# po/Makefile.in +# kernel/Makefile +# render/Makefile +# engines/Makefile +# engines/openbox/Makefile +# plugins/Makefile +# plugins/keyboard/Makefile +# plugins/mouse/Makefile +# plugins/placement/Makefile +# doc/Makefile +# doc/doxygen/Makefile +# data/Makefile +# data/buttons/Makefile +# themes/Makefile +# themes/openbox/Makefile]) AC_OUTPUT AC_MSG_RESULT diff --git a/doc/.cvsignore b/doc/.cvsignore index c7618772..e69de29b 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1,3 +0,0 @@ -Makefile -Makefile.in -openbox.1 diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 3409d8ca..00000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -#CLEANFILES = openbox.1 -MAINTAINERCLEANFILES = Makefile.in -#man_MANS = openbox.1 -SUBDIRS = doxygen - -#EXTRA_DIST = openbox.1.in - -DEFAULT_MENU=$(pkgdatadir)/menu - -distclean-local: - $(RM) *\~ .\#* - -openbox.1: openbox.1.in - @regex_cmd@ -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ - -e "s,@pkgdatadir@,$(pkgdatadir)," \ - -e "s,@version@,$(VERSION)," \ - @srcdir@/openbox.1.in > openbox.1 diff --git a/doc/doxygen/.cvsignore b/doc/doxygen/.cvsignore index 31a3c01a..99c8e168 100644 --- a/doc/doxygen/.cvsignore +++ b/doc/doxygen/.cvsignore @@ -1,5 +1,3 @@ -Makefile -Makefile.in html latex doxygen.conf diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am deleted file mode 100644 index 7a9212a5..00000000 --- a/doc/doxygen/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -all: - -doc: doxygen.conf - @doxygen doxygen.conf - @$(MAKE) -C latex pdf - @echo - @echo Documentation generated in $(shell pwd)/html - @echo - -doxygen.conf: doxygen.conf.in - @regex_cmd@ -e "s,\@version\@,$(VERSION)," \ - -e "s,\@basedir\@,`cd $(top_builddir) && pwd`," \ - doxygen.conf.in > doxygen.conf diff --git a/engines/.cvsignore b/engines/.cvsignore index 282522db..e69de29b 100644 --- a/engines/.cvsignore +++ b/engines/.cvsignore @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/engines/Makefile.am b/engines/Makefile.am deleted file mode 100644 index db3bc8d7..00000000 --- a/engines/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = openbox diff --git a/engines/openbox/.cvsignore b/engines/openbox/.cvsignore index ed2d4abe..99015b9e 100644 --- a/engines/openbox/.cvsignore +++ b/engines/openbox/.cvsignore @@ -1,7 +1,3 @@ -Makefile -Makefile.in -.deps -.libs openbox.la obengine.lo obtheme.lo diff --git a/engines/openbox/Makefile b/engines/openbox/Makefile new file mode 100644 index 00000000..2ed05a6e --- /dev/null +++ b/engines/openbox/Makefile @@ -0,0 +1,4 @@ +all clean distclean install uninstall: + $(MAKE) -$(MAKEFLAGS) -C ../.. $@ + +.PHONY: all clean distclean install uninstall diff --git a/engines/openbox/Makefile.am b/engines/openbox/Makefile.am deleted file mode 100644 index 33efbb71..00000000 --- a/engines/openbox/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -enginedir=$(libdir)/openbox/engines -themedir=$(datadir)/openbox/themes/openbox - -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ --DENGINEDIR=\"$(enginedir)\" \ --DTHEMEDIR=\"$(themedir)\" \ --DDEFAULT_THEME=\"nyz\" \ --DG_LOG_DOMAIN=\"Openbox-Engine\" - -engine_LTLIBRARIES=openbox.la - -openbox_la_LDFLAGS=-module -avoid-version -openbox_la_SOURCES=obengine.c obtheme.c obrender.c - -noinst_HEADERS=obengine.h obtheme.h obrender.h - -MAINTAINERCLEANFILES= Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/m4/openbox.m4 b/m4/openbox.m4 index 98033c9f..53da97ca 100644 --- a/m4/openbox.m4 +++ b/m4/openbox.m4 @@ -20,7 +20,7 @@ AC_DEFUN([OB_DEBUG], # cvs builds are always debug CVS="" - test "${VERSION%*cvs}" != "$VERSION" && CVS="yes" + test "${PACKAGE_VERSION%*cvs}" != "$PACKAGE_VERSION" && CVS="yes" test "$CVS" = "yes" && DEBUG="yes" if test "$DEBUG" = "yes"; then 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 -#include "y.tab.h" +#include "parse.tab.h" typedef enum { TOKEN_REAL, diff --git a/plugins/.cvsignore b/plugins/.cvsignore index 1d0256fb..f5a96968 100644 --- a/plugins/.cvsignore +++ b/plugins/.cvsignore @@ -1,9 +1 @@ -focus.lo -focus.la -Makefile -Makefile.in -.libs -.deps -focus_la-focus.lo resistance.la -resistance_la-resistance.lo diff --git a/plugins/Makefile b/plugins/Makefile new file mode 100644 index 00000000..56263a4a --- /dev/null +++ b/plugins/Makefile @@ -0,0 +1,4 @@ +all clean distclean install uninstall: + $(MAKE) -$(MAKEFLAGS) -C .. $@ + +.PHONY: all clean distclean install uninstall diff --git a/plugins/Makefile.am b/plugins/Makefile.am deleted file mode 100644 index 48b864e8..00000000 --- a/plugins/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -plugindir=$(libdir)/openbox/plugins - -SUBDIRS = keyboard mouse placement - -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ --DPLUGINDIR=\"$(plugindir)\" - -plugin_LTLIBRARIES=resistance.la - -resistance_la_CPPFLAGS=-DG_LOG_DOMAIN=\"Plugin-Resistance\" -resistance_la_LDFLAGS=-module -avoid-version -resistance_la_SOURCES=resistance.c - -noinst_HEADERS= - -MAINTAINERCLEANFILES= Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/keyboard/.cvsignore b/plugins/keyboard/.cvsignore index ef46dd01..7226a5da 100644 --- a/plugins/keyboard/.cvsignore +++ b/plugins/keyboard/.cvsignore @@ -1,14 +1,5 @@ keyboard.lo keyboard.la -Makefile -Makefile.in -.libs -.deps tree.lo translate.lo keyaction.lo -lex.kparse.c -lex.kparse.lo -y.tab.c -y.tab.h -y.tab.lo diff --git a/plugins/keyboard/Makefile b/plugins/keyboard/Makefile new file mode 100644 index 00000000..2ed05a6e --- /dev/null +++ b/plugins/keyboard/Makefile @@ -0,0 +1,4 @@ +all clean distclean install uninstall: + $(MAKE) -$(MAKEFLAGS) -C ../.. $@ + +.PHONY: all clean distclean install uninstall diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am deleted file mode 100644 index 1b6800ce..00000000 --- a/plugins/keyboard/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -plugindir=$(libdir)/openbox/plugins -rcdir=$(datadir)/openbox - -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ --DPLUGINDIR=\"$(plugindir)\" \ --DRCDIR=\"$(rcdir)\" \ --DG_LOG_DOMAIN=\"Plugin-Keyboard\" - -plugin_LTLIBRARIES=keyboard.la - -keyboard_la_LDFLAGS=-module -avoid-version -keyboard_la_SOURCES=keyboard.c tree.c translate.c y.tab.c lex.kparse.c - -lex.kparse.c: keysrc.l y.tab.c - $(FLEX) -Pkparse $< - -y.tab.c: keysrc.yacc - $(YACC) -d -p kparse $< - -rc_DATA=keysrc - -noinst_HEADERS=keyboard.h tree.h translate.h keysrc.h - -MAINTAINERCLEANFILES= Makefile.in - -clean-local: - $(RM) y.tab.c lex.kparse.c - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/mouse/.cvsignore b/plugins/mouse/.cvsignore index 41ed68d8..3e9347ec 100644 --- a/plugins/mouse/.cvsignore +++ b/plugins/mouse/.cvsignore @@ -1,10 +1,4 @@ mouse.lo mouse.la -Makefile -Makefile.in -.libs -.deps translate.lo -lex.mparse.c -lex.mparse.lo mouserc_parse.lo diff --git a/plugins/mouse/Makefile b/plugins/mouse/Makefile new file mode 100644 index 00000000..2ed05a6e --- /dev/null +++ b/plugins/mouse/Makefile @@ -0,0 +1,4 @@ +all clean distclean install uninstall: + $(MAKE) -$(MAKEFLAGS) -C ../.. $@ + +.PHONY: all clean distclean install uninstall diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am deleted file mode 100644 index 73250abc..00000000 --- a/plugins/mouse/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -plugindir=$(libdir)/openbox/plugins -rcdir=$(datadir)/openbox - -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ --DPLUGINDIR=\"$(plugindir)\" \ --DRCDIR=\"$(rcdir)\" \ --DG_LOG_DOMAIN=\"Plugin-Mouse\" - -plugin_LTLIBRARIES=mouse.la - -mouse_la_LDFLAGS=-module -avoid-version -mouse_la_SOURCES=mouse.c translate.c lex.mparse.c - -lex.mparse.c: mouserc_parse.l - $(FLEX) -Pmparse $^ - -rc_DATA=mouserc - -noinst_HEADERS=mouse.h translate.h mouserc_parse.h - -MAINTAINERCLEANFILES= Makefile.in - -clean-local: - $(RM) lex.mparse.c - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/placement/.cvsignore b/plugins/placement/.cvsignore index 3ea11c73..eee15c82 100644 --- a/plugins/placement/.cvsignore +++ b/plugins/placement/.cvsignore @@ -1,7 +1,3 @@ -Makefile.in -Makefile placement.la placement.lo -.deps -.libs history.lo diff --git a/plugins/placement/Makefile b/plugins/placement/Makefile new file mode 100644 index 00000000..2ed05a6e --- /dev/null +++ b/plugins/placement/Makefile @@ -0,0 +1,4 @@ +all clean distclean install uninstall: + $(MAKE) -$(MAKEFLAGS) -C ../.. $@ + +.PHONY: all clean distclean install uninstall diff --git a/plugins/placement/Makefile.am b/plugins/placement/Makefile.am deleted file mode 100644 index b48bb850..00000000 --- a/plugins/placement/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -plugindir=$(libdir)/openbox/plugins - -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ --DPLUGINDIR=\"$(plugindir)\" \ --DG_LOG_DOMAIN=\"Plugin-Placement\" - -plugin_LTLIBRARIES=placement.la - -placement_la_LDFLAGS=-module -avoid-version -placement_la_SOURCES=placement.c history.c - -noinst_HEADERS=history.h - -MAINTAINERCLEANFILES=Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/po/.cvsignore b/po/.cvsignore index cd716db5..0301235f 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -1,5 +1,3 @@ -Makefile -Makefile.in POTFILES openbox.pot remove-potcdate.sed diff --git a/render/.cvsignore b/render/.cvsignore index 8ce2c9d1..b79cafde 100644 --- a/render/.cvsignore +++ b/render/.cvsignore @@ -1,6 +1,2 @@ -? .deps -? .libs -? Makefile -? Makefile.in -? rendertest - +rendertest +librender.a diff --git a/render/Makefile b/render/Makefile new file mode 100644 index 00000000..56263a4a --- /dev/null +++ b/render/Makefile @@ -0,0 +1,4 @@ +all clean distclean install uninstall: + $(MAKE) -$(MAKEFLAGS) -C .. $@ + +.PHONY: all clean distclean install uninstall diff --git a/render/Makefile.am b/render/Makefile.am deleted file mode 100644 index 69d5231d..00000000 --- a/render/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ --DG_LOG_DOMAIN=\"Render\" - -LIBS=$(XFT_LIBS) $(PYTHON_LIBS) $(GLIB_LIBS) @LIBS@ - -noinst_PROGRAMS=rendertest -rendertest_SOURCES=$(librender_a_SOURCES) - -noinst_LIBRARIES=librender.a -librender_a_SOURCES=render.c test.c gradient.c color.c font.c mask.c image.c - -noinst_HEADERS=render.h gradient.h color.h font.h mask.h image.h - -MAINTAINERCLEANFILES= Makefile.in - -distclean-local: - $(RM) *\~ *.orig *.rej .\#* diff --git a/themes/.cvsignore b/themes/.cvsignore index 282522db..e69de29b 100644 --- a/themes/.cvsignore +++ b/themes/.cvsignore @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/themes/Makefile.am b/themes/Makefile.am deleted file mode 100644 index db3bc8d7..00000000 --- a/themes/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = openbox diff --git a/themes/openbox/.cvsignore b/themes/openbox/.cvsignore index 282522db..e69de29b 100644 --- a/themes/openbox/.cvsignore +++ b/themes/openbox/.cvsignore @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/themes/openbox/Makefile.am b/themes/openbox/Makefile.am deleted file mode 100644 index ea1f8acd..00000000 --- a/themes/openbox/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -themedir=$(datadir)/openbox/themes/openbox -eboxbuttondir=$(themedir)/ebox_buttons -fieronbuttondir=$(themedir)/fieron_buttons -fieron2buttondir=$(themedir)/fieron2_buttons - -theme_DATA = artwiz bbs bluebox cthulhain deep fieron fieron2 flux frobozz \ - frobust mbdtex miklos nyz nyzclone ob20 operation outcomes paper \ - purplehaaze shade steelblue steelblue2 the_orange trisb twice \ - warp-xp ebox - -eboxbutton_DATA = ebox_buttons/max.xbm ebox_buttons/icon.xbm \ - ebox_buttons/close.xbm -fieronbutton_DATA = fieron_buttons/max.xbm fieron_buttons/stick.xbm \ - fieron_buttons/close.xbm fieron_buttons/icon.xbm -fieron2button_DATA = fieron2_buttons/max.xbm fieron2_buttons/stick.xbm \ - fieron2_buttons/close.xbm fieron2_buttons/icon.xbm - -EXTRA_DIST = $(theme_DATA) - -MAINTAINERCLEANFILES = Makefile.in - -distclean-local: - $(RM) *\~ .\#* -uninstall-am: - -rmdir -p $(DESTDIR)$(themedir)