diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | build/Makefile.cwmcc | 46 | ||||
| -rw-r--r-- | build/Makefile.engines.openbox | 2 | ||||
| -rw-r--r-- | build/Makefile.obcl | 46 | ||||
| -rw-r--r-- | build/Makefile.plugins.keyboard | 2 | ||||
| -rw-r--r-- | build/Makefile.plugins.mouse | 2 | ||||
| -rw-r--r-- | build/Makefile.plugins.placement | 2 | ||||
| -rw-r--r-- | build/Makefile.plugins.resistance | 2 | ||||
| -rw-r--r-- | build/Makefile.render | 17 | ||||
| -rw-r--r-- | cwmcc/.cvsignore | 3 | ||||
| -rw-r--r-- | cwmcc/cwmcc.c | 0 | ||||
| -rw-r--r-- | obcl/.cvsignore | 3 | ||||
| -rw-r--r-- | obcl/obcl.c | 0 | ||||
| -rw-r--r-- | render/.cvsignore | 1 |
14 files changed, 116 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 400c1c98..6212dd4c 100644 --- 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 index 00000000..4e17a7dd --- /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 b5ed7293..3830dd29 100644 --- 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 index 00000000..c602c686 --- /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 0aedf696..6af04c80 100644 --- 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 da392d6d..8e7c5459 100644 --- 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 06428a53..edc0ed18 100644 --- 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 b1405401..6b428990 100644 --- 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 a16edeef..58b2d5db 100644 --- 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 index 00000000..626fb25e --- /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 index 00000000..e69de29b --- /dev/null +++ b/cwmcc/cwmcc.c diff --git a/obcl/.cvsignore b/obcl/.cvsignore new file mode 100644 index 00000000..5d7048fe --- /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 index 00000000..e69de29b --- /dev/null +++ b/obcl/obcl.c diff --git a/render/.cvsignore b/render/.cvsignore index 1811768e..7a8b3196 100644 --- a/render/.cvsignore +++ b/render/.cvsignore @@ -8,3 +8,4 @@ image.lo mask.lo render.lo test.lo +libobrender.la |