build fixes for finding Xlibs and for setting vars based on found Xlib info and Xiner...

[chaz/openbox] / build / Makefile.kernel

diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index 46770379720bcbdc5b8f0b82ea928df2198bb8ab..6d64b4166b5d67ea24553ca641e80a0fa362b787 100644 (file)
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -2,13 +2,13 @@ include build/Makefile.incl
 
 dir = kernel
 
-CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \
+CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS) \
             -DG_LOG_DOMAIN=\"Openbox\"
-LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS)
-LDFLAGS = -export-dynamic
+LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS)
+LDFLAGS += -export-dynamic
 
 target = openbox3
-sources = action.c client.c config.c dispatch.c engine.c event.c \
+sources = action.c client.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 \
           parse.lex.c parse.tab.c
@@ -25,6 +25,10 @@ all: $(target)
 $(target): $(objects) render/librender.a
        $(LINK) -o $@ $^ $(LIBS) $(LDFLAGS)
 
+# kill the implicit .c.y rule
+$(srcdir)/%.c: $(srcdir)/%.y
+       @
+
 $(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d
        $(COMPILE) -c -o $@ $<
 
@@ -49,7 +53,7 @@ uninstall:
 
 clean:
        $(LTCLEAN) $(target)
-       $(RM) $(objects) $(dir)/*\~
+       $(RM) $(objects) $(srcdir)/*\~
        $(RM) $(filter %.lex.c, $(sources))
        $(RM) $(filter %.tab.c, $(sources))
        $(RM) $(patsubst %.c,%.h, $(filter %.tab.c, $(sources)))
@@ -58,4 +62,4 @@ distclean:
 
 -include $(deps)
 
-.PHONY: kernel-install kernel-uninstall kernel-clean
+.PHONY: all install uninstall clean distclean