add libcwmcc and libobcl

diff --git a/Makefile.in b/Makefile.in
index 400c1c98bed943fd9bab9a0efbf16f9e6a58f945..6212dd4c0d7765a62b6f2be3be0cd0f5a20edf92 100644 (file)
--- a/Makefile.in
+++ b/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 \

diff --git a/build/Makefile.cwmcc b/build/Makefile.cwmcc
new file mode 100644 (file)
index 0000000..4e17a7d
--- /dev/null
+++ b/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

diff --git a/build/Makefile.engines.openbox b/build/Makefile.engines.openbox
index b5ed7293e92cbc10310f5232364baefc91b0aaca..3830dd29bba2c67727fad8d97ad62802d2304050 100644 (file)
--- a/build/Makefile.engines.openbox
+++ b/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)

diff --git a/build/Makefile.obcl b/build/Makefile.obcl
new file mode 100644 (file)
index 0000000..c602c68
--- /dev/null
+++ b/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

diff --git a/build/Makefile.plugins.keyboard b/build/Makefile.plugins.keyboard
index 0aedf69687e84034aae7be74686922ee6cae5e1d..6af04c808c71b468ac7c619db559c5a82ce68a4b 100644 (file)
--- a/build/Makefile.plugins.keyboard
+++ b/build/Makefile.plugins.keyboard
@@ -37,7 +37,7 @@ uninstall:
        $(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target))
 
 clean:
-       $(RM) $(target) $(objects)
+       $(LTCLEAN) $(target) $(objects)
        $(RM) $(srcdir)/*\~
 
 distclean:

diff --git a/build/Makefile.plugins.mouse b/build/Makefile.plugins.mouse
index da392d6d730346be6ac82d6e9fd2a1ad165bf544..8e7c5459ab7047adf23028eea15871ce9102ecd5 100644 (file)
--- a/build/Makefile.plugins.mouse
+++ b/build/Makefile.plugins.mouse
@@ -37,7 +37,7 @@ uninstall:
        $(LTRM) $(DESTDIR)$(plugindir)/$(notdir $(target))
 
 clean:
-       $(RM) $(target) $(objects)
+       $(LTCLEAN) $(target) $(objects)
        $(RM) $(srcdir)/*\~
 
 distclean:

diff --git a/build/Makefile.plugins.placement b/build/Makefile.plugins.placement
index 06428a53af812245cf38ac12a9baccf0602f84fb..edc0ed189d5e896cf40afc0ebd5ea1f86f14d12d 100644 (file)
--- a/build/Makefile.plugins.placement
+++ b/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)

diff --git a/build/Makefile.plugins.resistance b/build/Makefile.plugins.resistance
index b14054012804715f94b285048005ee10302eb41f..6b4289909012a450f08093cc63be2c6edbc12c52 100644 (file)
--- a/build/Makefile.plugins.resistance
+++ b/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)

diff --git a/build/Makefile.render b/build/Makefile.render
index a16edeef62923d8d298a35b75a9a2efddbdd0add..58b2d5dbfc94dd6681599adc70db180ebf5b5480 100644 (file)
--- a/build/Makefile.render
+++ b/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 @@ $(depdir)/%.d: $(srcdir)/%.c
        @$(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:
 

diff --git a/cwmcc/.cvsignore b/cwmcc/.cvsignore
new file mode 100644 (file)
index 0000000..626fb25
--- /dev/null
+++ b/cwmcc/.cvsignore
@@ -0,0 +1,3 @@
+.libs
+cwmcc.lo
+libcwmcc.la

diff --git a/cwmcc/cwmcc.c b/cwmcc/cwmcc.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/obcl/.cvsignore b/obcl/.cvsignore
new file mode 100644 (file)
index 0000000..5d7048f
--- /dev/null
+++ b/obcl/.cvsignore
@@ -0,0 +1,3 @@
+obcl.lo
+libobcl.la
+.libs

diff --git a/obcl/obcl.c b/obcl/obcl.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/render/.cvsignore b/render/.cvsignore
index 1811768e6031e3ca3acd4c38f152ed1900c6eddd..7a8b3196a1496ac318b639fde6084f4e6ae6ea24 100644 (file)
--- a/render/.cvsignore
+++ b/render/.cvsignore
@@ -8,3 +8,4 @@ image.lo
 mask.lo
 render.lo
 test.lo
+libobrender.la