From: Dana Jansens Date: Sun, 6 Apr 2003 10:21:56 +0000 (+0000) Subject: more build system fixups X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=8a4e27bdc362e3781ac947ff5536c1f0dbd3ba60;p=chaz%2Fopenbox more build system fixups --- diff --git a/build/Makefile.engines.openbox b/build/Makefile.engines.openbox index b19a4f9b..b5ed7293 100644 --- a/build/Makefile.engines.openbox +++ b/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 diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in index b6da814f..c87609c2 100644 --- a/build/Makefile.incl.in +++ b/build/Makefile.incl.in @@ -1,4 +1,7 @@ +# @configure_input@ + CC = @CC@ +@SET_MAKE@ MAKE += --no-print-directory CFLAGS = @CFLAGS@ @@ -11,6 +14,7 @@ CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ \ -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@ @@ -45,8 +48,6 @@ 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) DEPCOMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) diff --git a/build/Makefile.kernel b/build/Makefile.kernel index 71492d89..43aaddce 100644 --- a/build/Makefile.kernel +++ b/build/Makefile.kernel @@ -5,7 +5,7 @@ dir = kernel 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 \ diff --git a/build/Makefile.plugins.keyboard b/build/Makefile.plugins.keyboard index 497ce797..0aedf696 100644 --- a/build/Makefile.plugins.keyboard +++ b/build/Makefile.plugins.keyboard @@ -3,7 +3,7 @@ include build/Makefile.incl 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 diff --git a/build/Makefile.plugins.mouse b/build/Makefile.plugins.mouse index 63f0d389..da392d6d 100644 --- a/build/Makefile.plugins.mouse +++ b/build/Makefile.plugins.mouse @@ -3,7 +3,7 @@ include build/Makefile.incl 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 diff --git a/build/Makefile.plugins.placement b/build/Makefile.plugins.placement index 248546fc..06428a53 100644 --- a/build/Makefile.plugins.placement +++ b/build/Makefile.plugins.placement @@ -3,7 +3,7 @@ include build/Makefile.incl 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 diff --git a/build/Makefile.plugins.resistance b/build/Makefile.plugins.resistance index 4f3922ab..b1405401 100644 --- a/build/Makefile.plugins.resistance +++ b/build/Makefile.plugins.resistance @@ -3,7 +3,7 @@ include build/Makefile.incl 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 diff --git a/build/Makefile.render b/build/Makefile.render index de25d5e7..a16edeef 100644 --- a/build/Makefile.render +++ b/build/Makefile.render @@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir) all: $(target) $(target): $(objects) - $(LINK) -static -o $@ $^ + $(LINK) -static -o $@ $^ $(LDFLAGS) $(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d $(LTCOMPILE) -c -o $@ $< diff --git a/configure.ac b/configure.ac index a9281dc3..0692209d 100644 --- a/configure.ac +++ b/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])