nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more build system fixups

Browse source
This commit is contained in:
Dana Jansens 2003-04-06 10:21:56 +00:00
parent 5d665673a2
commit 8a4e27bdc3
9 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/Makefile.engines.openbox
View file

@ -5,7 +5,7 @@ theme = operation
CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Engine-Openbox\" \ CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Engine-Openbox\" \
-DDEFAULT_THEME=\"$(theme)\" -DTHEMEDIR=\"$(themedir)/openbox\" -DDEFAULT_THEME=\"$(theme)\" -DTHEMEDIR=\"$(themedir)/openbox\"
LDFLAGS = -module -avoid-version LDFLAGS += -module -avoid-version
target = openbox.la target = openbox.la
sources = obengine.c obtheme.c obrender.c sources = obengine.c obtheme.c obrender.c

9
build/Makefile.incl.in
View file

@ -1,4 +1,7 @@
# @configure_input@
CC = @CC@ CC = @CC@
@SET_MAKE@
MAKE += --no-print-directory MAKE += --no-print-directory
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -11,6 +14,7 @@ CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ \
-DBINARY=\"$(binary)\" -DBINARY=\"$(binary)\"
DEFS = @DEFS@ DEFS = @DEFS@
LIBS = @LIBS@ LIBS = @LIBS@
LDFLAGS = @LDFLAGS@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED
@ -27,9 +31,8 @@ INSTALL = @INSTALL@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
srcdir = @srcdir@ srcdir = @srcdir@
# non-recursive!
top_builddir = . top_builddir = .
depdir = .deps
prefix ?= @prefix@ prefix ?= @prefix@
exec_prefix ?= @exec_prefix@ exec_prefix ?= @exec_prefix@
@ -45,8 +48,6 @@ plugindir = $(libdir)/openbox/plugins
rcdir = $(datadir)/openbox rcdir = $(datadir)/openbox
themedir = $(datadir)/openbox/themes themedir = $(datadir)/openbox/themes
depdir = .deps
COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS)
DEPCOMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) DEPCOMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS)

2
build/Makefile.kernel
View file

@ -5,7 +5,7 @@ dir = kernel
CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \ CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \
-DG_LOG_DOMAIN=\"Openbox\" -DG_LOG_DOMAIN=\"Openbox\"
LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS)
LDFLAGS = -export-dynamic LDFLAGS += -export-dynamic
target = openbox3 target = openbox3
sources = action.c client.c dispatch.c engine.c event.c \ sources = action.c client.c dispatch.c engine.c event.c \

2
build/Makefile.plugins.keyboard
View file

@ -3,7 +3,7 @@ include build/Makefile.incl
dir = plugins/keyboard dir = plugins/keyboard
CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Keyboard\" CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Keyboard\"
LDFLAGS = -module -avoid-version LDFLAGS += -module -avoid-version
target = keyboard.la target = keyboard.la
sources = keyboard.c tree.c translate.c keyparse.c sources = keyboard.c tree.c translate.c keyparse.c

2
build/Makefile.plugins.mouse
View file

@ -3,7 +3,7 @@ include build/Makefile.incl
dir = plugins/mouse dir = plugins/mouse
CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Mouse\" CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Mouse\"
LDFLAGS = -module -avoid-version LDFLAGS += -module -avoid-version
target = mouse.la target = mouse.la
sources = mouse.c translate.c mouseparse.c sources = mouse.c translate.c mouseparse.c

2
build/Makefile.plugins.placement
View file

@ -3,7 +3,7 @@ include build/Makefile.incl
dir = plugins/placement dir = plugins/placement
CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Placement\" CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Placement\"
LDFLAGS = -module -avoid-version LDFLAGS += -module -avoid-version
target = placement.la target = placement.la
sources = history.c placement.c sources = history.c placement.c

2
build/Makefile.plugins.resistance
View file

@ -3,7 +3,7 @@ include build/Makefile.incl
dir = plugins dir = plugins
CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Resistance\" CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Resistance\"
LDFLAGS = -module -avoid-version LDFLAGS += -module -avoid-version
target = resistance.la target = resistance.la
sources = resistance.c sources = resistance.c

2
build/Makefile.render
View file

@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir)
all: $(target) all: $(target)
$(target): $(objects) $(target): $(objects)
$(LINK) -static -o $@ $^ $(LINK) -static -o $@ $^ $(LDFLAGS)
$(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d $(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d
$(LTCOMPILE) -c -o $@ $< $(LTCOMPILE) -c -o $@ $<

2
configure.ac
View file

@ -16,6 +16,8 @@ OB_COMPILER_FLAGS
AC_C_CONST AC_C_CONST
AC_C_INLINE AC_C_INLINE
AC_PROG_MAKE_SET
if test "$CVS" = "yes"; then if test "$CVS" = "yes"; then
AC_PATH_PROG([FLEX], [flex]) AC_PATH_PROG([FLEX], [flex])
test "$FLEX" || AC_MSG_ERROR([flex not found]) test "$FLEX" || AC_MSG_ERROR([flex not found])