From dfc9680e333c3a10fedea103136b03c1ebc1ab2b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 13 Apr 2003 21:17:02 +0000 Subject: [PATCH] back to automake --- .cvsignore | 7 + INSTALL | 223 ------------------------------ Makefile.am | 16 +++ Makefile.in | 34 ----- bootstrap | 4 +- build/.cvsignore | 1 - build/Makefile.cwmcc | 48 ------- build/Makefile.data | 28 ---- build/Makefile.incl.in | 60 -------- build/Makefile.kernel | 67 --------- build/Makefile.obcl | 47 ------- build/Makefile.plugins | 22 --- build/Makefile.plugins.keyboard | 47 ------- build/Makefile.plugins.mouse | 47 ------- build/Makefile.plugins.placement | 45 ------ build/Makefile.plugins.resistance | 45 ------ build/Makefile.render | 49 ------- build/Makefile.themes | 72 ---------- configure.ac | 21 ++- cwmcc/Makefile | 4 - data/.cvsignore | 2 + data/Makefile.am | 8 ++ obcl/Makefile | 4 - openbox/.cvsignore | 2 + openbox/Makefile | 4 - openbox/Makefile.am | 49 +++++++ plugins/.cvsignore | 3 + plugins/Makefile | 4 - plugins/Makefile.am | 21 +++ plugins/keyboard/.cvsignore | 2 + plugins/keyboard/Makefile | 4 - plugins/keyboard/Makefile.am | 18 +++ plugins/mouse/.cvsignore | 2 + plugins/mouse/Makefile | 4 - plugins/mouse/Makefile.am | 18 +++ plugins/placement/.cvsignore | 2 + plugins/placement/Makefile | 4 - plugins/placement/Makefile.am | 18 +++ po/.cvsignore | 2 + render/.cvsignore | 2 + render/Makefile | 4 - render/Makefile.am | 27 ++++ tests/Makefile | 6 - themes/.cvsignore | 2 + themes/Makefile.am | 11 ++ 45 files changed, 228 insertions(+), 882 deletions(-) delete mode 100644 INSTALL create mode 100644 Makefile.am delete mode 100644 Makefile.in delete mode 100644 build/.cvsignore delete mode 100644 build/Makefile.cwmcc delete mode 100644 build/Makefile.data delete mode 100644 build/Makefile.incl.in delete mode 100644 build/Makefile.kernel delete mode 100644 build/Makefile.obcl delete mode 100644 build/Makefile.plugins delete mode 100644 build/Makefile.plugins.keyboard delete mode 100644 build/Makefile.plugins.mouse delete mode 100644 build/Makefile.plugins.placement delete mode 100644 build/Makefile.plugins.resistance delete mode 100644 build/Makefile.render delete mode 100644 build/Makefile.themes delete mode 100644 cwmcc/Makefile create mode 100644 data/.cvsignore create mode 100644 data/Makefile.am delete mode 100644 obcl/Makefile delete mode 100644 openbox/Makefile create mode 100644 openbox/Makefile.am delete mode 100644 plugins/Makefile create mode 100644 plugins/Makefile.am delete mode 100644 plugins/keyboard/Makefile create mode 100644 plugins/keyboard/Makefile.am delete mode 100644 plugins/mouse/Makefile create mode 100644 plugins/mouse/Makefile.am delete mode 100644 plugins/placement/Makefile create mode 100644 plugins/placement/Makefile.am delete mode 100644 render/Makefile create mode 100644 render/Makefile.am delete mode 100644 tests/Makefile create mode 100644 themes/Makefile.am diff --git a/.cvsignore b/.cvsignore index 33bdc704..2356ef42 100644 --- a/.cvsignore +++ b/.cvsignore @@ -9,3 +9,10 @@ Makefile config.guess config.sub ltmain.sh +ABOUT-NLS +INSTALL +compile +config.rpath +depcomp +missing +mkinstalldirs diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 7da5af40..00000000 --- a/INSTALL +++ /dev/null @@ -1,223 +0,0 @@ -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..060cf7dc --- /dev/null +++ b/Makefile.am @@ -0,0 +1,16 @@ +#SUBDIRS = po themes doc render cwmcc obcl kernel plugins +SUBDIRS = po themes data render kernel plugins +MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in + +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 + +.PHONY: doc diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 75ebca4b..00000000 --- a/Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ -include build/Makefile.incl - -targets = render cwmcc obcl kernel plugins themes data - -all: libtool - @for i in $(targets); do \ - $(MAKE) -$(MAKEFLAGS) -f build/Makefile.$$i $@ || break; \ - done - -uninstall: - @for i in $(targets); do \ - $(MAKE) -$(MAKEFLAGS) -f build/Makefile.$$i $@ || break; \ - done - -install: all - @for i in $(targets); do \ - $(MAKE) -$(MAKEFLAGS) -f build/Makefile.$$i $@ || break; \ - done - -clean: - @for i in $(targets); do \ - $(MAKE) -$(MAKEFLAGS) -f build/Makefile.$$i $@ || break; \ - done - $(RM) *\~ - -distclean: clean - $(RM) configure Makefile.incl Makefile - $(RM) -r .deps/ - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - -.PHONY: all clean distclean install uninstall diff --git a/bootstrap b/bootstrap index 8558dea7..288bd69b 100755 --- a/bootstrap +++ b/bootstrap @@ -4,12 +4,12 @@ sh() { /bin/sh -c "set -x; $*" } -#sh autopoint --force # for GNU gettext +sh autopoint --force # for GNU gettext 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 deleted file mode 100644 index 848f07ea..00000000 --- a/build/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.incl diff --git a/build/Makefile.cwmcc b/build/Makefile.cwmcc deleted file mode 100644 index 7ad79615..00000000 --- a/build/Makefile.cwmcc +++ /dev/null @@ -1,48 +0,0 @@ -include build/Makefile.incl - -dir = cwmcc - -CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"CWMCC\" -LIBS += $(GLIB_LIBS) - -target = libcwmcc.la -sources = cwmcc.c atom.c prop.c client_props.c root_props.c - -srcdir := $(srcdir)/$(dir) -target := $(addprefix $(dir)/, $(target)) -objects := $(addprefix $(dir)/, $(sources:.c=.lo)) -sources := $(addprefix $(srcdir)/, $(sources)) -deps := $(addprefix $(depdir)/, $(objects:.lo=.d)) -depdir := $(depdir)/$(dir) - -all: $(target) - -$(target): $(objects) - $(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS) - -$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d - $(LTCOMPILE) -c -o $@ $< - -$(depdir)/%.d: $(srcdir)/%.c - @echo Building dependancies for $< - @$(INSTALL) -d $(depdir) - @$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $< - -install: - $(INSTALL) -d $(DESTDIR)$(libdir)/ - $(LIBTOOL) --mode=install $(INSTALL) $(target) \ - $(DESTDIR)$(libdir)/$(notdir $(target)) - $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir) - -uninstall: - $(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target)) - -clean: - $(LTCLEAN) $(target) $(objects) - $(RM) $(srcdir)/*\~ - -distclean: - --include $(deps) - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.data b/build/Makefile.data deleted file mode 100644 index 4e2b522b..00000000 --- a/build/Makefile.data +++ /dev/null @@ -1,28 +0,0 @@ -include build/Makefile.incl - -dir = data - -files = rc3 - -srcdir := $(srcdir)/$(dir) -dir := $(DESTDIR)$(rcdir) -sources := $(addprefix $(srcdir)/,$(files)) - -all: - -install: - $(INSTALL) -d $(dir) - $(INSTALL) -m 644 $(sources) $(dir) - -uninstall: - for i in $(files); do \ - $(RM) $(dir)/$$i; \ - done - -rmdir $(dir) - -clean: - $(RM) $(srcdir)/*\~ - -distclean: - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in deleted file mode 100644 index c420d82b..00000000 --- a/build/Makefile.incl.in +++ /dev/null @@ -1,60 +0,0 @@ -# @configure_input@ - -CC = @CC@ -@SET_MAKE@ -MAKE += --no-print-directory - -CFLAGS = @CFLAGS@ -CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ \ - -DLOCALEDIR=\"$(localedir)\" \ - -DRCDIR=\"$(rcdir)\" \ - -DPLUGINDIR=\"$(plugindir)\" \ - -DENGINEDIR=\"$(enginedir)\" \ - -DDEFAULT_ENGINE=\"openbox\" \ - -DBINARY=\"$(binary)\" -DEFS = @DEFS@ -LIBS = @LIBS@ -LDFLAGS = @LDFLAGS@ - -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED - -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ -DG_DISABLE_DEPRECATED - -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -XINERAMA_LIBS = @XINERAMA_LIBS@ - -XFT_CFLAGS = @XFT_CFLAGS@ -XFT_LIBS = @XFT_LIBS@ - -FLEX = @FLEX@ -BISON = @BISON@ -INSTALL = @INSTALL@ -LIBTOOL = @LIBTOOL@ - -srcdir = @srcdir@ -top_builddir = . -depdir = .deps - -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 -themedir = $(datadir)/openbox/themes - -COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -DEPCOMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS) -LTCLEAN = $(LIBTOOL) --mode=clean $(RM) -LTRM = $(LIBTOOL) --mode=uninstall $(RM) diff --git a/build/Makefile.kernel b/build/Makefile.kernel deleted file mode 100644 index e0ccfa26..00000000 --- a/build/Makefile.kernel +++ /dev/null @@ -1,67 +0,0 @@ -include build/Makefile.incl - -dir = kernel - -CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS) \ - -DG_LOG_DOMAIN=\"Openbox\" -LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS) \ - -lobrender -LDFLAGS += -Lrender -export-dynamic - -target = openbox3 -sources = action.c client.c config.c dispatch.c event.c group.c \ - extensions.c focus.c frame.c grab.c menu.c openbox.c framerender.c \ - parse.c plugin.c prop.c screen.c stacking.c timer.c xerror.c \ - parse.lex.c parse.tab.c - -srcdir := $(srcdir)/$(dir) -target := $(addprefix $(dir)/,$(target)) -objects := $(addprefix $(dir)/,$(sources:.c=.lo)) -sources := $(addprefix $(srcdir)/,$(sources)) -deps := $(addprefix $(depdir)/,$(objects:.lo=.d)) -depdir := $(depdir)/$(dir) - -all: $(target) - -$(target): $(objects) render/libobrender.la - $(LINK) -o $@ $^ $(LIBS) $(LDFLAGS) - -# kill the implicit .c.y rule -$(srcdir)/%.c: $(srcdir)/%.y - @ - -$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d - $(COMPILE) -c -o $@ $< - -%.lex.c: %.l - $(FLEX) -o$@ $< - -%.tab.c: %.y - $(BISON) -d -o $@ $< - -$(depdir)/%.d: $(srcdir)/%.c - @echo Building dependancies for $< - @$(INSTALL) -d $(depdir) - @$(CC) $(CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $< - -install: - $(INSTALL) -d $(DESTDIR)$(bindir)/ - $(LIBTOOL) --mode=install $(INSTALL) $(target) \ - $(DESTDIR)$(bindir)/$(notdir $(target)) - -uninstall: - -$(RM) $(DESTDIR)$(bindir)/$(notdir $(target)) - -rmdir $(DESTDIR)$(bindir)/ - -clean: - $(LTCLEAN) $(target) - $(RM) $(objects) $(srcdir)/*\~ - $(RM) $(filter %.lex.c, $(sources)) - $(RM) $(filter %.tab.c, $(sources)) - $(RM) $(patsubst %.c,%.h, $(filter %.tab.c, $(sources))) - -distclean: - --include $(deps) - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.obcl b/build/Makefile.obcl deleted file mode 100644 index c972a776..00000000 --- a/build/Makefile.obcl +++ /dev/null @@ -1,47 +0,0 @@ -include build/Makefile.incl - -dir = obcl - -CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"OBCF\" - -target = libobcl.la -sources = obcl.c - -srcdir := $(srcdir)/$(dir) -target := $(addprefix $(dir)/, $(target)) -objects := $(addprefix $(dir)/, $(sources:.c=.lo)) -sources := $(addprefix $(srcdir)/, $(sources)) -deps := $(addprefix $(depdir)/, $(objects:.lo=.d)) -depdir := $(depdir)/$(dir) - -all: $(target) - -$(target): $(objects) - $(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS) - -$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d - $(LTCOMPILE) -c -o $@ $< - -$(depdir)/%.d: $(srcdir)/%.c - @echo Building dependancies for $< - @$(INSTALL) -d $(depdir) - @$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $< - -install: - $(INSTALL) -d $(DESTDIR)$(libdir)/ - $(LIBTOOL) --mode=install $(INSTALL) $(target) \ - $(DESTDIR)$(libdir)/$(notdir $(target)) - $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir) - -uninstall: - $(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target)) - -clean: - $(LTCLEAN) $(target) $(objects) - $(RM) $(srcdir)/*\~ - -distclean: - --include $(deps) - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.plugins b/build/Makefile.plugins deleted file mode 100644 index 86781355..00000000 --- a/build/Makefile.plugins +++ /dev/null @@ -1,22 +0,0 @@ -include build/Makefile.incl - -targets = resistance placement keyboard mouse - -all clean distclean: - @for i in $(targets); do \ - $(MAKE) -$(MAKEFLAGS) -f build/Makefile.plugins.$$i $@; \ - done - -install: - @for i in $(targets); do \ - $(MAKE) -$(MAKEFLAGS) -f build/Makefile.plugins.$$i $@; \ - done - $(LIBTOOL) --mode=finish $(DESTDIR)$(plugindir) - -uninstall: - @for i in $(targets); do \ - $(MAKE) -$(MAKEFLAGS) -f build/Makefile.plugins.$$i $@; \ - done - -rmdir $(DESTDIR)$(plugindir) - -.PHONY: all clean distclean install uninstall diff --git a/build/Makefile.plugins.keyboard b/build/Makefile.plugins.keyboard deleted file mode 100644 index 6af04c80..00000000 --- a/build/Makefile.plugins.keyboard +++ /dev/null @@ -1,47 +0,0 @@ -include build/Makefile.incl - -dir = plugins/keyboard - -CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Keyboard\" -LDFLAGS += -module -avoid-version - -target = keyboard.la -sources = keyboard.c tree.c translate.c keyparse.c - -srcdir := $(srcdir)/$(dir) -target := $(addprefix $(dir)/,$(target)) -objects := $(addprefix $(dir)/,$(sources:.c=.lo)) -sources := $(addprefix $(srcdir)/,$(sources)) -deps := $(addprefix $(depdir)/,$(objects:.lo=.d)) -depdir := $(depdir)/$(dir) - -all: $(target) - -$(target): $(objects) - $(LINK) -rpath $(plugindir) -o $@ $^ $(LDFLAGS) - -$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d - $(LTCOMPILE) -c -o $@ $< - -$(depdir)/%.d: $(srcdir)/%.c - @echo Building dependancies for $< - $(INSTALL) -d $(depdir) - @$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $< - -install: - $(INSTALL) -d $(DESTDIR)$(plugindir)/ - $(LIBTOOL) --mode=install $(INSTALL) $(target) \ - $(DESTDIR)$(plugindir)/$(notdir $(target)) - -uninstall: - $(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target)) - -clean: - $(LTCLEAN) $(target) $(objects) - $(RM) $(srcdir)/*\~ - -distclean: - --include $(deps) - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.plugins.mouse b/build/Makefile.plugins.mouse deleted file mode 100644 index 8e7c5459..00000000 --- a/build/Makefile.plugins.mouse +++ /dev/null @@ -1,47 +0,0 @@ -include build/Makefile.incl - -dir = plugins/mouse - -CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Mouse\" -LDFLAGS += -module -avoid-version - -target = mouse.la -sources = mouse.c translate.c mouseparse.c - -srcdir := $(srcdir)/$(dir) -target := $(addprefix $(dir)/,$(target)) -objects := $(addprefix $(dir)/,$(sources:.c=.lo)) -sources := $(addprefix $(srcdir)/,$(sources)) -deps := $(addprefix $(depdir)/,$(objects:.lo=.d)) -depdir := $(depdir)/$(dir) - -all: $(target) - -$(target): $(objects) - $(LINK) -rpath $(plugindir) -o $@ $^ $(LDFLAGS) - -$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d - $(LTCOMPILE) -c -o $@ $< - -$(depdir)/%.d: $(srcdir)/%.c - @echo Building dependancies for $< - $(INSTALL) -d $(depdir) - @$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $< - -install: - $(INSTALL) -d $(DESTDIR)$(plugindir)/ - $(LIBTOOL) --mode=install $(INSTALL) $(target) \ - $(DESTDIR)$(plugindir)/$(notdir $(target)) - -uninstall: - $(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target)) - -clean: - $(LTCLEAN) $(target) $(objects) - $(RM) $(srcdir)/*\~ - -distclean: - --include $(deps) - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.plugins.placement b/build/Makefile.plugins.placement deleted file mode 100644 index edc0ed18..00000000 --- a/build/Makefile.plugins.placement +++ /dev/null @@ -1,45 +0,0 @@ -include build/Makefile.incl - -dir = plugins/placement - -CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Placement\" -LDFLAGS += -module -avoid-version - -target = placement.la -sources = history.c placement.c - -srcdir := $(srcdir)/$(dir) -target := $(addprefix $(dir)/,$(target)) -objects := $(addprefix $(dir)/,$(sources:.c=.lo)) -sources := $(addprefix $(srcdir)/,$(sources)) -deps := $(addprefix $(depdir)/,$(objects:.lo=.d)) -depdir := $(depdir)/$(dir) - -all: $(target) - -$(target): $(objects) - $(LINK) -rpath $(plugindir) -o $@ $^ $(LDFLAGS) - -$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d - $(LTCOMPILE) -c -o $@ $< - -$(depdir)/%.d: $(srcdir)/%.c - @echo Building dependancies for $< - $(INSTALL) -d $(depdir) - @$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $< - -install: - $(INSTALL) -d $(DESTDIR)$(plugindir)/ - $(LIBTOOL) --mode=install $(INSTALL) $(target) \ - $(DESTDIR)$(plugindir)/$(notdir $(target)) - -uninstall: - $(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target)) - -clean: - $(LTCLEAN) $(target) $(objects) - $(RM) $(srcdir)/*\~ - --include $(deps) - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.plugins.resistance b/build/Makefile.plugins.resistance deleted file mode 100644 index 6b428990..00000000 --- a/build/Makefile.plugins.resistance +++ /dev/null @@ -1,45 +0,0 @@ -include build/Makefile.incl - -dir = plugins - -CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Resistance\" -LDFLAGS += -module -avoid-version - -target = resistance.la -sources = resistance.c - -srcdir := $(srcdir)/$(dir) -target := $(addprefix $(dir)/,$(target)) -objects := $(addprefix $(dir)/,$(sources:.c=.lo)) -sources := $(addprefix $(srcdir)/,$(sources)) -deps := $(addprefix $(depdir)/,$(objects:.lo=.d)) -depdir := $(depdir)/$(dir) - -all: $(target) - -$(target): $(objects) - $(LINK) -rpath $(plugindir) -o $@ $^ $(LDFLAGS) - -$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d - $(LTCOMPILE) -c -o $@ $< - -$(depdir)/%.d: $(srcdir)/%.c - @echo Building dependancies for $< - $(INSTALL) -d $(depdir) - @$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $< - -install: - $(INSTALL) -d $(DESTDIR)$(plugindir)/ - $(LIBTOOL) --mode=install $(INSTALL) $(target) \ - $(DESTDIR)$(plugindir)/$(notdir $(target)) - -uninstall: - $(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target)) - -clean: - $(LTCLEAN) $(target) $(objects) - $(RM) $(srcdir)/*\~ - --include $(deps) - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.render b/build/Makefile.render deleted file mode 100644 index e47afa2a..00000000 --- a/build/Makefile.render +++ /dev/null @@ -1,49 +0,0 @@ -include build/Makefile.incl - -dir = render -theme = operation - -CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Render\" \ - -DDEFAULT_THEME=\"$(theme)\" -DTHEMEDIR=\"$(themedir)\" - -target = libobrender.la -sources = color.c font.c gradient.c image.c mask.c render.c theme.c - -srcdir := $(srcdir)/$(dir) -target := $(addprefix $(dir)/, $(target)) -objects := $(addprefix $(dir)/, $(sources:.c=.lo)) -sources := $(addprefix $(srcdir)/, $(sources)) -deps := $(addprefix $(depdir)/, $(objects:.lo=.d)) -depdir := $(depdir)/$(dir) - -all: $(target) - -$(target): $(objects) - $(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS) - -$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d - $(LTCOMPILE) -c -o $@ $< - -$(depdir)/%.d: $(srcdir)/%.c - @echo Building dependancies for $< - @$(INSTALL) -d $(depdir) - @$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $< - -install: - $(INSTALL) -d $(DESTDIR)$(libdir)/ - $(LIBTOOL) --mode=install $(INSTALL) $(target) \ - $(DESTDIR)$(libdir)/$(notdir $(target)) - $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir) - -uninstall: - $(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target)) - -clean: - $(LTCLEAN) $(target) $(objects) - $(RM) $(srcdir)/*\~ - -distclean: - --include $(deps) - -.PHONY: all install uninstall clean distclean diff --git a/build/Makefile.themes b/build/Makefile.themes deleted file mode 100644 index c08e2103..00000000 --- a/build/Makefile.themes +++ /dev/null @@ -1,72 +0,0 @@ -include build/Makefile.incl - -dir = themes - -files = 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 - -srcdir := $(srcdir)/$(dir) -dir := $(DESTDIR)$(themedir) -sources := $(addprefix $(srcdir)/,$(files)) - -fieron_buttons_dir := $(dir)/fieron_buttons -fieron_buttons_srcdir := $(srcdir)/fieron_buttons -fieron_buttons := close.xbm icon.xbm max.xbm stick.xbm -fieron_buttons_sources := $(addprefix $(fieron_buttons_srcdir)/,$(fieron_buttons)) - -fieron2_buttons_dir:=$(dir)/fieron2_buttons -fieron2_buttons_srcdir:=$(srcdir)/fieron2_buttons -fieron2_buttons:=close.xbm icon.xbm max.xbm stick.xbm -fieron2_buttons_sources := $(addprefix $(fieron2_buttons_srcdir)/,$(fieron2_buttons)) - -ebox_buttons_dir:=$(dir)/ebox_buttons -ebox_buttons_srcdir:=$(srcdir)/ebox_buttons -ebox_buttons:=close.xbm icon.xbm max.xbm -ebox_buttons_sources := $(addprefix $(ebox_buttons_srcdir)/,$(ebox_buttons)) - -all: - -install: - $(INSTALL) -d $(dir) - for i in $(sources); do \ - $(INSTALL) -m 644 $$i $(dir); \ - done - - $(INSTALL) -d $(fieron_buttons_dir) - for i in $(fieron_buttons_sources); do \ - $(INSTALL) $$i $(fieron_buttons_dir); \ - done - $(INSTALL) -d $(fieron2_buttons_dir) - for i in $(fieron2_buttons_sources); do \ - $(INSTALL) $$i $(fieron2_buttons_dir); \ - done - $(INSTALL) -d $(ebox_buttons_dir) - for i in $(ebox_buttons_sources); do \ - $(INSTALL) $$i $(ebox_buttons_dir); \ - done - -uninstall: - for i in $(ebox_buttons); do \ - $(RM) $(ebox_buttons_dir)/$$i; \ - done - -rmdir $(ebox_buttons_dir) - for i in $(fieron2_buttons); do \ - $(RM) $(fieron2_buttons_dir)/$$i; \ - done - -rmdir $(fieron2_buttons_dir) - for i in $(fieron_buttons); do \ - $(RM) $(fieron_buttons_dir)/$$i; \ - done - -rmdir $(fieron_buttons_dir) - for i in $(files); do \ - $(RM) $(dir)/$$i; \ - done - -rmdir $(dir) - -clean: - -distclean: - -.PHONY: all clean distclean install uninstall diff --git a/configure.ac b/configure.ac index c9299731..e8ba1b38 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.50]) AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org]) +AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([kernel/openbox.c]) AC_PREFIX_DEFAULT([/usr/local]) @@ -33,12 +34,9 @@ LIBTOOL="$LIBTOOL --silent" AC_PROG_INSTALL -OB_NLS -## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ## -##ALL_LINGUAS="" -##AM_GNU_GETTEXT_VERSION(0.11.5) -##AM_GNU_GETTEXT([external]) -## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ## +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) @@ -62,7 +60,16 @@ X11_EXT_XKB X11_EXT_SHAPE X11_EXT_XINERAMA -AC_CONFIG_FILES([Makefile build/Makefile.incl]) +AC_CONFIG_FILES([Makefile + po/Makefile.in + themes/Makefile + data/Makefile + render/Makefile + kernel/Makefile + plugins/Makefile + plugins/placement/Makefile + plugins/mouse/Makefile + plugins/keyboard/Makefile]) AC_OUTPUT AC_MSG_RESULT diff --git a/cwmcc/Makefile b/cwmcc/Makefile deleted file mode 100644 index 56263a4a..00000000 --- a/cwmcc/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all clean distclean install uninstall: - $(MAKE) -$(MAKEFLAGS) -C .. $@ - -.PHONY: all clean distclean install uninstall diff --git a/data/.cvsignore b/data/.cvsignore new file mode 100644 index 00000000..3dda7298 --- /dev/null +++ b/data/.cvsignore @@ -0,0 +1,2 @@ +Makefile.in +Makefile diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 00000000..a16d18c9 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,8 @@ +rcdir=$(datadir)/openbox + +rc_DATA=rc3 + +MAINTAINERCLEANFILES=Makefile.in + +distclean-local: + $(RM) *\~ *.orig *.rej .\#* diff --git a/obcl/Makefile b/obcl/Makefile deleted file mode 100644 index 56263a4a..00000000 --- a/obcl/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all clean distclean install uninstall: - $(MAKE) -$(MAKEFLAGS) -C .. $@ - -.PHONY: all clean distclean install uninstall diff --git a/openbox/.cvsignore b/openbox/.cvsignore index b4b3cfc3..ee6225ab 100644 --- a/openbox/.cvsignore +++ b/openbox/.cvsignore @@ -26,3 +26,5 @@ screen.lo stacking.lo timer.lo xerror.lo +Makefile.in +.deps diff --git a/openbox/Makefile b/openbox/Makefile deleted file mode 100644 index 56263a4a..00000000 --- a/openbox/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all clean distclean install uninstall: - $(MAKE) -$(MAKEFLAGS) -C .. $@ - -.PHONY: all clean distclean install uninstall diff --git a/openbox/Makefile.am b/openbox/Makefile.am new file mode 100644 index 00000000..5c5d39d8 --- /dev/null +++ b/openbox/Makefile.am @@ -0,0 +1,49 @@ +localedir=$(datadir)/locale +plugindir=$(libdir)/openbox/plugins +rcdir=$(datadir)/openbox + +binary=openbox3 +url=http://icculus.org/openbox + +CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \ + @CPPFLAGS@ \ + -DLOCALEDIR=\"$(localedir)\" \ + -DRCDIR=\"$(rcdir)\" \ + -DPLUGINDIR=\"$(plugindir)\" \ + -DG_LOG_DOMAIN=\"Openbox\" \ + -DBINARY=\"$(binary)\" + +INCLUDES=-I.. +LIBS=$(X_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) @LIBS@ + +bin_PROGRAMS=$(binary) + +openbox3_LDADD=@LIBINTL@ -lobrender -L../render +openbox3_LDFLAGS=-export-dynamic +openbox3_SOURCES=parse.tab.c parse.lex.c action.c client.c config.c \ + extensions.c focus.c frame.c grab.c menu.c openbox.c \ + framerender.c parse.c plugin.c prop.c screen.c stacking.c \ + dispatch.c event.c group.c timer.c xerror.c + +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 parse.h parse.tab.h plugin.h prop.h screen.h \ + stacking.h timer.h xerror.h + +# kill the implicit .c.y rule +%.c: %.y + @ + +%.lex.c: %.l + $(FLEX) -o$@ $< + +%.tab.c: %.y + $(BISON) -d -o $@ $< + +MAINTAINERCLEANFILES=Makefile.in + +clean-local: + $(RM) parse.lex.c parse.tab.c parse.tab.h + +distclean-local: + $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/.cvsignore b/plugins/.cvsignore index a9eba4f1..a9f1d6d0 100644 --- a/plugins/.cvsignore +++ b/plugins/.cvsignore @@ -1,3 +1,6 @@ resistance.la .libs resistance.lo +Makefile.in +.deps +resistance_la-resistance.lo diff --git a/plugins/Makefile b/plugins/Makefile deleted file mode 100644 index 56263a4a..00000000 --- a/plugins/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all clean distclean install uninstall: - $(MAKE) -$(MAKEFLAGS) -C .. $@ - -.PHONY: all clean distclean install uninstall diff --git a/plugins/Makefile.am b/plugins/Makefile.am new file mode 100644 index 00000000..2ef58f15 --- /dev/null +++ b/plugins/Makefile.am @@ -0,0 +1,21 @@ +plugindir=$(libdir)/openbox/plugins + +SUBDIRS = keyboard mouse placement + +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ +-DPLUGINDIR=\"$(plugindir)\" + +INCLUDES=-I.. + +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 7c81a799..15d08bb6 100644 --- a/plugins/keyboard/.cvsignore +++ b/plugins/keyboard/.cvsignore @@ -5,3 +5,5 @@ translate.lo keyaction.lo .libs keyparse.lo +Makefile.in +.deps diff --git a/plugins/keyboard/Makefile b/plugins/keyboard/Makefile deleted file mode 100644 index 2ed05a6e..00000000 --- a/plugins/keyboard/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -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 new file mode 100644 index 00000000..9e956787 --- /dev/null +++ b/plugins/keyboard/Makefile.am @@ -0,0 +1,18 @@ +plugindir=$(libdir)/openbox/plugins + +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ + -DG_LOG_DOMAIN=\"Plugin-Keyboard\" + +INCLUDES=-I../.. + +plugin_LTLIBRARIES=keyboard.la + +keyboard_la_LDFLAGS=-module -avoid-version +keyboard_la_SOURCES=keyboard.c keyparse.c translate.c tree.c + +noinst_HEADERS=keyboard.h keyparse.h translate.h tree.h + +MAINTAINERCLEANFILES=Makefile.in + +distclean-local: + $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/mouse/.cvsignore b/plugins/mouse/.cvsignore index d1419b78..1ae746bd 100644 --- a/plugins/mouse/.cvsignore +++ b/plugins/mouse/.cvsignore @@ -3,3 +3,5 @@ mouse.la translate.lo mouseparse.lo .libs +Makefile.in +.deps diff --git a/plugins/mouse/Makefile b/plugins/mouse/Makefile deleted file mode 100644 index 2ed05a6e..00000000 --- a/plugins/mouse/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -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 new file mode 100644 index 00000000..06c3b00d --- /dev/null +++ b/plugins/mouse/Makefile.am @@ -0,0 +1,18 @@ +plugindir=$(libdir)/openbox/plugins + +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ + -DG_LOG_DOMAIN=\"Plugin-Mouse\" + +INCLUDES=-I../.. + +plugin_LTLIBRARIES=mouse.la + +mouse_la_LDFLAGS=-module -avoid-version +mouse_la_SOURCES=mouse.c mouseparse.c translate.c + +noinst_HEADERS=mouse.h mouseparse.h translate.h + +MAINTAINERCLEANFILES=Makefile.in + +distclean-local: + $(RM) *\~ *.orig *.rej .\#* diff --git a/plugins/placement/.cvsignore b/plugins/placement/.cvsignore index 4be40fa9..aeb5750c 100644 --- a/plugins/placement/.cvsignore +++ b/plugins/placement/.cvsignore @@ -2,3 +2,5 @@ placement.la placement.lo history.lo .libs +Makefile.in +.deps diff --git a/plugins/placement/Makefile b/plugins/placement/Makefile deleted file mode 100644 index 2ed05a6e..00000000 --- a/plugins/placement/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -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 new file mode 100644 index 00000000..096d7600 --- /dev/null +++ b/plugins/placement/Makefile.am @@ -0,0 +1,18 @@ +plugindir=$(libdir)/openbox/plugins + +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ + -DG_LOG_DOMAIN=\"Plugin-Placement\" + +INCLUDES=-I../.. + +plugin_LTLIBRARIES=placement.la + +placement_la_LDFLAGS=-module -avoid-version +placement_la_SOURCES=history.c placement.c + +noinst_HEADERS=history.h + +MAINTAINERCLEANFILES=Makefile.in + +distclean-local: + $(RM) *\~ *.orig *.rej .\#* diff --git a/po/.cvsignore b/po/.cvsignore index 0301235f..b1aefd9d 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -9,3 +9,5 @@ en@quot.header insert-header.sin quot.sed remove-potcdate.sin +Makefile.in +Makefile diff --git a/render/.cvsignore b/render/.cvsignore index f3de6485..c64d1a63 100644 --- a/render/.cvsignore +++ b/render/.cvsignore @@ -10,3 +10,5 @@ render.lo test.lo libobrender.la theme.lo +Makefile.in +.deps diff --git a/render/Makefile b/render/Makefile deleted file mode 100644 index 56263a4a..00000000 --- a/render/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all clean distclean install uninstall: - $(MAKE) -$(MAKEFLAGS) -C .. $@ - -.PHONY: all clean distclean install uninstall diff --git a/render/Makefile.am b/render/Makefile.am new file mode 100644 index 00000000..c9641c25 --- /dev/null +++ b/render/Makefile.am @@ -0,0 +1,27 @@ +themedir=$(datadir)/openbox/themes + +theme=operation + +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \ + -DG_LOG_DOMAIN=\"Render\" \ + -DDEFAULT_THEME=\"$(theme)\" \ + -DTHEMEDIR=\"$(themedir)\" + +INCLUDES=-I.. +LIBS=$(XFT_LIBS) $(GLIB_LIBS) @LIBS@ + +noinst_PROGRAMS=rendertest +rendertest_LDFLAGS=-lobrender -L. +rendertest_SOURCES=test.c + +lib_LTLIBRARIES=libobrender.la +libobrender_la_SOURCES=color.c font.c gradient.c image.c mask.c render.c \ + theme.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/tests/Makefile b/tests/Makefile deleted file mode 100644 index 7dbff040..00000000 --- a/tests/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -files=$(wildcard *.c) - -all: $(files:.c=) - -%: %.c - $(CC) $(CFLAGS) -o $@ $^ -lX11 -L/usr/X11R6/lib -I/usr/X11R6/include diff --git a/themes/.cvsignore b/themes/.cvsignore index e69de29b..3dda7298 100644 --- a/themes/.cvsignore +++ b/themes/.cvsignore @@ -0,0 +1,2 @@ +Makefile.in +Makefile diff --git a/themes/Makefile.am b/themes/Makefile.am new file mode 100644 index 00000000..2a4e6b7a --- /dev/null +++ b/themes/Makefile.am @@ -0,0 +1,11 @@ +themedir=$(datadir)/openbox/themes + +theme_DATA=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 + +MAINTAINERCLEANFILES=Makefile.in + +distclean-local: + $(RM) *\~ *.orig *.rej .\#*