X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=build%2FMakefile.kernel;h=6d64b4166b5d67ea24553ca641e80a0fa362b787;hb=86f1830d0ab76b07999ed35e29a32d405ee22ac4;hp=ed7fe5b19b94e8d38474a2a01766c9cedcbb2184;hpb=ce901a234111f0a6cf98b441c011289ce0d0bdfa;p=chaz%2Fopenbox

diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index ed7fe5b1..6d64b416 100644
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -2,22 +2,18 @@ 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
-lex = parse.l
-yacc = parse.y
 
 srcdir := $(srcdir)/$(dir)
-lex := $(addprefix $(srcdir)/,$(lex))
-yacc := $(addprefix $(srcdir)/,$(yacc))
 target := $(addprefix $(dir)/,$(target))
 objects := $(addprefix $(dir)/,$(sources:.c=.o))
 sources := $(addprefix $(srcdir)/,$(sources))
@@ -29,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 $@ $<
 
@@ -53,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)))
@@ -62,4 +62,4 @@ distclean:
 
 -include $(deps)
 
-.PHONY: kernel-install kernel-uninstall kernel-clean
+.PHONY: all install uninstall clean distclean