shrimpx above miklos?

[chaz/openbox] / build / Makefile.kernel

diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index 69c8ac697c0546c9c5b2dbf26d21a4e8e77523f4..e0ccfa264a26cd0dbfb53f2bb7d247f50476b325 100644 (file)
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -2,30 +2,35 @@ 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) \
+       -lobrender
+LDFLAGS += -Lrender -export-dynamic
 
 target = openbox3
-sources = action.c client.c config.c dispatch.c engine.c event.c \
-          extensions.c focus.c frame.c grab.c menu.c openbox.c \
+sources = action.c client.c config.c dispatch.c event.c group.c \
+          extensions.c focus.c frame.c grab.c menu.c openbox.c framerender.c \
           parse.c plugin.c prop.c screen.c stacking.c timer.c xerror.c \
           parse.lex.c parse.tab.c
 
 srcdir := $(srcdir)/$(dir)
 target := $(addprefix $(dir)/,$(target))
-objects := $(addprefix $(dir)/,$(sources:.c=.o))
+objects := $(addprefix $(dir)/,$(sources:.c=.lo))
 sources := $(addprefix $(srcdir)/,$(sources))
-deps := $(addprefix $(depdir)/,$(objects:.o=.d))
+deps := $(addprefix $(depdir)/,$(objects:.lo=.d))
 depdir := $(depdir)/$(dir)
 
 all: $(target)
 
-$(target): $(objects) render/librender.a
+$(target): $(objects) render/libobrender.la
        $(LINK) -o $@ $^ $(LIBS) $(LDFLAGS)
 
-$(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d
+# kill the implicit .c.y rule
+$(srcdir)/%.c: $(srcdir)/%.y
+       @
+
+$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
        $(COMPILE) -c -o $@ $<
 
 %.lex.c: %.l
@@ -36,12 +41,13 @@ $(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d
 
 $(depdir)/%.d: $(srcdir)/%.c
        @echo Building dependancies for $<
-       $(INSTALL) -d $(depdir)
-       @$(CC) $(CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.o) $<
+       @$(INSTALL) -d $(depdir)
+       @$(CC) $(CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
 
 install:
        $(INSTALL) -d $(DESTDIR)$(bindir)/
-       $(INSTALL) $(target) $(DESTDIR)$(bindir)/$(notdir $(target))
+       $(LIBTOOL) --mode=install $(INSTALL) $(target) \
+               $(DESTDIR)$(bindir)/$(notdir $(target))
 
 uninstall:
        -$(RM) $(DESTDIR)$(bindir)/$(notdir $(target))
@@ -58,4 +64,4 @@ distclean:
 
 -include $(deps)
 
-.PHONY: kernel-install kernel-uninstall kernel-clean
+.PHONY: all install uninstall clean distclean