all repos — openbox @ d0e9015651aa960cf8cb58a5ab08da79e6aeb51b

openbox fork - make it a bit more like ryudo 

add libcwmcc and libobcl
Dana Jansens danakj@orodu.net
commit

d0e9015651aa960cf8cb58a5ab08da79e6aeb51b

parent

c2983d1f155e3fe67d32cf9cf10cb2cb7661096b

14 files changed, 116 insertions(+), 12 deletions(-)

jump to
M Makefile.in → Makefile.in 
@@ -1,6 +1,6 @@ 
 include build/Makefile.incl
 
-targets = render kernel plugins engines themes data
+targets = render cwmcc obcl kernel plugins engines themes data
 
 all: libtool
 	@for i in $(targets); do \
A build/Makefile.cwmcc 
@@ -0,0 +1,46 @@ 
+include build/Makefile.incl
+
+dir = cwmcc
+
+CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"CWMCC\"
+
+target = libcwmcc.la
+sources = cwmcc.c
+
+srcdir := $(srcdir)/$(dir)
+target := $(addprefix $(dir)/, $(target))
+objects := $(addprefix $(dir)/, $(sources:.c=.lo))
+sources := $(addprefix $(srcdir)/, $(sources))
+deps := $(addprefix $(depdir)/, $(objects:.lo=.d))
+depdir := $(depdir)/$(dir)
+
+all: $(target)
+
+$(target): $(objects)
+	$(LINK) -o $@ $^ $(LDFLAGS)
+
+$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
+	$(LTCOMPILE) -c -o $@ $<
+
+$(depdir)/%.d: $(srcdir)/%.c
+	@echo Building dependancies for $<
+	@$(INSTALL) -d $(depdir)
+	@$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.o) $<
+
+install:
+	$(INSTALL) -d $(DESTDIR)$(libdir)/
+	$(LIBTOOL) --mode=install $(INSTALL) $(target) \
+		$(DESTDIR)$(libdir)/$(notdir $(target))
+
+uninstall:
+	$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))
+
+clean:
+	$(LTCLEAN) $(target) $(objects)
+	$(RM) $(srcdir)/*\~
+
+distclean:
+
+-include $(deps)
+
+.PHONY: all install uninstall clean distclean
M build/Makefile.engines.openbox → build/Makefile.engines.openbox 
@@ -39,7 +39,7 @@ uninstall:
 	$(LTRM) $(DESTDIR)$(enginedir)/$(notdir $(target))
 
 clean:
-	$(RM) $(target) $(objects)
+	$(LTCLEAN) $(target) $(objects)
 	$(RM) $(srcdir)/*\~
 
 -include $(deps)
A build/Makefile.obcl 
@@ -0,0 +1,46 @@ 
+include build/Makefile.incl
+
+dir = obcl
+
+CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"OBCF\"
+
+target = libobcl.la
+sources = obcl.c
+
+srcdir := $(srcdir)/$(dir)
+target := $(addprefix $(dir)/, $(target))
+objects := $(addprefix $(dir)/, $(sources:.c=.lo))
+sources := $(addprefix $(srcdir)/, $(sources))
+deps := $(addprefix $(depdir)/, $(objects:.lo=.d))
+depdir := $(depdir)/$(dir)
+
+all: $(target)
+
+$(target): $(objects)
+	$(LINK) -o $@ $^ $(LDFLAGS)
+
+$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
+	$(LTCOMPILE) -c -o $@ $<
+
+$(depdir)/%.d: $(srcdir)/%.c
+	@echo Building dependancies for $<
+	@$(INSTALL) -d $(depdir)
+	@$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.o) $<
+
+install:
+	$(INSTALL) -d $(DESTDIR)$(libdir)/
+	$(LIBTOOL) --mode=install $(INSTALL) $(target) \
+		$(DESTDIR)$(libdir)/$(notdir $(target))
+
+uninstall:
+	$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))
+
+clean:
+	$(LTCLEAN) $(target) $(objects)
+	$(RM) $(srcdir)/*\~
+
+distclean:
+
+-include $(deps)
+
+.PHONY: all install uninstall clean distclean
M build/Makefile.plugins.keyboard → build/Makefile.plugins.keyboard 
@@ -37,7 +37,7 @@ uninstall:
 	$(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target))
 
 clean:
-	$(RM) $(target) $(objects)
+	$(LTCLEAN) $(target) $(objects)
 	$(RM) $(srcdir)/*\~
 
 distclean:
M build/Makefile.plugins.mouse → build/Makefile.plugins.mouse 
@@ -37,7 +37,7 @@ uninstall:
 	$(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target))
 
 clean:
-	$(RM) $(target) $(objects)
+	$(LTCLEAN) $(target) $(objects)
 	$(RM) $(srcdir)/*\~
 
 distclean:
M build/Makefile.plugins.placement → build/Makefile.plugins.placement 
@@ -37,7 +37,7 @@ uninstall:
 	$(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target))
 
 clean:
-	$(RM) $(target) $(objects)
+	$(LTCLEAN) $(target) $(objects)
 	$(RM) $(srcdir)/*\~
 
 -include $(deps)
M build/Makefile.plugins.resistance → build/Makefile.plugins.resistance 
@@ -37,7 +37,7 @@ uninstall:
 	$(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target))
 
 clean:
-	$(RM) $(target) $(objects)
+	$(LTCLEAN) $(target) $(objects)
 	$(RM) $(srcdir)/*\~
 
 -include $(deps)
M build/Makefile.render → build/Makefile.render 
@@ -4,22 +4,22 @@ dir = render
 
 CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Render\"
 
-target = librender.a
+target = libobrender.la
 sources = color.c font.c gradient.c image.c mask.c render.c test.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)
-	$(LINK) -static -o $@ $^ $(LDFLAGS)
+	$(LINK) -o $@ $^ $(LDFLAGS)
 
-$(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d
+$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
 	$(LTCOMPILE) -c -o $@ $<
 
 $(depdir)/%.d: $(srcdir)/%.c

@@ -28,11 +28,16 @@ @$(INSTALL) -d $(depdir)
 	@$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.o) $<
 
 install:
+	$(INSTALL) -d $(DESTDIR)$(libdir)/
+	$(LIBTOOL) --mode=install $(INSTALL) $(target) \
+		$(DESTDIR)$(libdir)/$(notdir $(target))
 
 uninstall:
+	$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))
 
 clean:
-	$(RM) $(target) $(objects) $(srcdir)/*\~
+	$(LTCLEAN) $(target) $(objects)
+	$(RM) $(srcdir)/*\~
 
 distclean:
A cwmcc/.cvsignore 
@@ -0,0 +1,3 @@ 
+.libs
+cwmcc.lo
+libcwmcc.la
A obcl/.cvsignore 
@@ -0,0 +1,3 @@ 
+obcl.lo
+libobcl.la
+.libs
M render/.cvsignore → render/.cvsignore 
@@ -8,3 +8,4 @@ image.lo
 mask.lo
 render.lo
 test.lo
+libobrender.la