more build system fixups
Dana Jansens danakj@orodu.net
9 files changed,
14 insertions(+),
11 deletions(-)
M
build/Makefile.engines.openbox
→
build/Makefile.engines.openbox
@@ -5,7 +5,7 @@ theme = operation
CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Engine-Openbox\" \ -DDEFAULT_THEME=\"$(theme)\" -DTHEMEDIR=\"$(themedir)/openbox\" -LDFLAGS = -module -avoid-version +LDFLAGS += -module -avoid-version target = openbox.la sources = obengine.c obtheme.c obrender.c
M
build/Makefile.incl.in
→
build/Makefile.incl.in
@@ -1,4 +1,7 @@
+# @configure_input@ + CC = @CC@ +@SET_MAKE@ MAKE += --no-print-directory CFLAGS = @CFLAGS@@@ -11,6 +14,7 @@ -DDEFAULT_ENGINE=\"openbox\" \
-DBINARY=\"$(binary)\" DEFS = @DEFS@ LIBS = @LIBS@ +LDFLAGS = @LDFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED@@ -27,9 +31,8 @@ INSTALL = @INSTALL@
LIBTOOL = @LIBTOOL@ srcdir = @srcdir@ - -# non-recursive! top_builddir = . +depdir = .deps prefix ?= @prefix@ exec_prefix ?= @exec_prefix@@@ -44,8 +47,6 @@ enginedir = $(libdir)/openbox/engines
plugindir = $(libdir)/openbox/plugins rcdir = $(datadir)/openbox themedir = $(datadir)/openbox/themes - -depdir = .deps COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS)
M
build/Makefile.kernel
→
build/Makefile.kernel
@@ -5,7 +5,7 @@
CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \ -DG_LOG_DOMAIN=\"Openbox\" LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) -LDFLAGS = -export-dynamic +LDFLAGS += -export-dynamic target = openbox3 sources = action.c client.c dispatch.c engine.c event.c \
M
build/Makefile.plugins.keyboard
→
build/Makefile.plugins.keyboard
@@ -3,7 +3,7 @@
dir = plugins/keyboard CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Keyboard\" -LDFLAGS = -module -avoid-version +LDFLAGS += -module -avoid-version target = keyboard.la sources = keyboard.c tree.c translate.c keyparse.c
M
build/Makefile.plugins.mouse
→
build/Makefile.plugins.mouse
@@ -3,7 +3,7 @@
dir = plugins/mouse CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Mouse\" -LDFLAGS = -module -avoid-version +LDFLAGS += -module -avoid-version target = mouse.la sources = mouse.c translate.c mouseparse.c
M
build/Makefile.plugins.placement
→
build/Makefile.plugins.placement
@@ -3,7 +3,7 @@
dir = plugins/placement CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Placement\" -LDFLAGS = -module -avoid-version +LDFLAGS += -module -avoid-version target = placement.la sources = history.c placement.c
M
build/Makefile.plugins.resistance
→
build/Makefile.plugins.resistance
@@ -3,7 +3,7 @@
dir = plugins CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Resistance\" -LDFLAGS = -module -avoid-version +LDFLAGS += -module -avoid-version target = resistance.la sources = resistance.c
M
build/Makefile.render
→
build/Makefile.render
@@ -17,7 +17,7 @@
all: $(target) $(target): $(objects) - $(LINK) -static -o $@ $^ + $(LINK) -static -o $@ $^ $(LDFLAGS) $(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d $(LTCOMPILE) -c -o $@ $<
M
configure.ac
→
configure.ac
@@ -16,6 +16,8 @@ OB_COMPILER_FLAGS
AC_C_CONST AC_C_INLINE +AC_PROG_MAKE_SET + if test "$CVS" = "yes"; then AC_PATH_PROG([FLEX], [flex]) test "$FLEX" || AC_MSG_ERROR([flex not found])