]> Dogcows Code - chaz/yoink/blobdiff - Makefile
remove some unused stlplus modules
[chaz/yoink] / Makefile
index e104a4ef1710d7c12629c9f3e4ffbb4292e4257d..a0c754b694dbf64e9d42fc277ec02fcacfcbd9a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 
 # Set V to `1' to echo each build command in full.  The default behavior
 # will keep output minimal.
-V              = 0
+V      = 0
 
 SHELL  = /bin/sh
 
@@ -35,7 +35,7 @@ include config.mk
 
 DATA_TARGETS   :=
 EXEC_TARGETS   :=
-SUBDIRS                        :=
+SUBDIRS                :=
 
 define include_func =
 ifeq (,$$d)
@@ -43,13 +43,13 @@ dir := $1
 else
 dir    := $$d/$1
 endif
-sp                             := $$(sp).x
+sp     := $$(sp).x
 dirstack_$$(sp)        := $$d
 datstack_$$(sp) := $$(data)
 exestack_$$(sp) := $$(exec)
-d                              := $$(dir)
-data :=
-exec :=
+d      := $$(dir)
+data   :=
+exec   :=
 include $$(dir)/rules.mk
 SUBDIRS += $$d $$b
 data   := $$(sort $$(data) $$(appdir_$$b) $$(mandir_$$b) $$(pkgdatadir_$$b) $$(desktop_$$b))
@@ -59,7 +59,7 @@ clean   := $$(clean) $$(deps) $$(exec) $$(data)
 DEPFILE := $$(DEPFILE) $$(deps)
 DATA_TARGETS += $$(data)
 EXEC_TARGETS += $$(exec)
-d              := $$(dirstack_$$(sp))
+d      := $$(dirstack_$$(sp))
 data   := $$(datstack_$$(sp))
 exec   := $$(exestack_$$(sp))
 sp     := $$(basename $$(sp))
@@ -68,7 +68,7 @@ include       = $(foreach i,$1,$(eval $(call include_func,$i)))
 
 targets                = $(EXEC_TARGETS) $(DATA_TARGETS)
 builddir       = build/obj
-b                      = $(builddir)/$(d)
+b              = $(builddir)/$(d)
 this           = $(d)/rules.mk
 
 ifeq (gzip,$(manCompression))
@@ -85,7 +85,7 @@ endif
 #
 
 $(call include,src data doc)
--include build/$(platform)/rules.mk
+-include build/arch/$(platform)/rules.mk
 
 
 #
@@ -98,7 +98,7 @@ PKG_CFLAGS    += -MD -MP -MF $(@:%.o=%.d) -MT $@
 endif
 
 # Include current directory to allow sources to include config.h.
-override CPPFLAGS      += -I.
+override CPPFLAGS      += -I. -DHAVE_CONFIG_H=1
 TGT_CXXFLAGS           = $(TGT_CFLAGS)
 ARFLAGS                = rc
 INSTALL                = install
@@ -106,51 +106,51 @@ INSTALL           = install
 tarname                = $(TARNAME)-$(VERSION)
 
 cmd_compile_c  = $(CC) $(PKG_CFLAGS) $(TGT_CFLAGS) $(CFLAGS) $(CPPFLAGS) \
-                                 $(TARGET_ARCH) -c $(OUTPUT_OPTION) $<
+                 $(TARGET_ARCH) -c $(OUTPUT_OPTION) $<
 cmd_compile_cc = $(CXX) $(PKG_CXXFLAGS) $(TGT_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS) \
-                                 $(TARGET_ARCH) -c $(OUTPUT_OPTION) $<
-cmd_link_c             = $(CC) $(PKG_CFLAGS) $(TGT_CFLAGS) $(CFLAGS) $(CPPFLAGS) \
-                                 $(PKG_LDFLAGS) $(TGT_LDFLAGS) $(LDFLAGS) \
-                                 $(TARGET_ARCH) $^ $(LOADLIBES) $(PKG_LDLIBS) $(TGT_LDLIBS) $(LDLIBS) -o $@
-cmd_link_cc            = $(CXX) $(PKG_CXXFLAGS) $(TGT_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS) \
-                                 $(PKG_LDFLAGS) $(TGT_LDFLAGS) $(LDFLAGS) \
-                                 $(TARGET_ARCH) $^ $(LOADLIBES) $(PKG_LDLIBS) $(TGT_LDLIBS) $(LDLIBS) -o $@
-cmd_ar                 = $(AR) $(ARFLAGS) $@ $^; $(RANLIB) $@
+                 $(TARGET_ARCH) -c $(OUTPUT_OPTION) $<
+cmd_link_c     = $(CC) $(PKG_CFLAGS) $(TGT_CFLAGS) $(CFLAGS) $(CPPFLAGS) \
+                 $(PKG_LDFLAGS) $(TGT_LDFLAGS) $(LDFLAGS) \
+                 $(TARGET_ARCH) $^ $(LOADLIBES) $(PKG_LDLIBS) $(TGT_LDLIBS) $(LDLIBS) -o $@
+cmd_link_cc    = $(CXX) $(PKG_CXXFLAGS) $(TGT_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS) \
+                 $(PKG_LDFLAGS) $(TGT_LDFLAGS) $(LDFLAGS) \
+                 $(TARGET_ARCH) $^ $(LOADLIBES) $(PKG_LDLIBS) $(TGT_LDLIBS) $(LDLIBS) -o $@
+cmd_ar         = $(AR) $(ARFLAGS) $@ $^; $(RANLIB) $@
 cmd_compile_rc = $(WINDRES) $(CPPFLAGS) $(TARGET_ARCH) $(OUTPUT_OPTION) -i $<
-cmd_sed                        = sed -f config.sed <$< >$@
-cmd_gzip               = gzip -c $< >$@
-cmd_bzip2              = bzip2 -c $< >$@
-cmd_xxd                        = id=$(subst .,_,$(notdir $<)); \
-                                 printf "\#include <stddef.h>\nsize_t\tdata_%s_size = %d;\nchar\tdata_%s[] = {\n" \
-                                 $$id $$(wc -c <$<) $$id >$@; \
-                                 xxd -i <$< >>$@; \
-                                 printf ", 0x00\n};\n" >>$@
+cmd_sed                = sed -f config.sed <$< >$@
+cmd_gzip       = gzip -c $< >$@
+cmd_bzip2      = bzip2 -c $< >$@
+cmd_xxd                = id=$(subst .,_,$(notdir $<)); \
+                 printf "\#include <stddef.h>\nsize_t\tdata_%s_size = %d;\nchar\tdata_%s[] = {\n" \
+                 $$id $$(wc -c <$<) $$id >$@; \
+                 xxd -i <$< >>$@; \
+                 printf ", 0x00\n};\n" >>$@
 cmd_configure  = ./configure
 func_install   = mkdir -p $(DESTDIR)$3 && $(INSTALL) -m $1 $2 $(DESTDIR)$3
-func_remove            = rm -f $1
-func_dist              = git archive HEAD --prefix='$(tarname)/' | $1 >"$(tarname).tar.$2" && \
-                                 (md5 "$(tarname).tar.$2" 2>/dev/null || md5sum "$(tarname).tar.$2")
+func_remove    = rm -f $1
+func_dist      = git archive HEAD --prefix='$(tarname)/' | $1 >"$(tarname).tar.$2" && \
+                 (md5 "$(tarname).tar.$2" 2>/dev/null || md5sum "$(tarname).tar.$2")
 
 compile_c      = $(call func_print,CC,$@) $(cmd_compile_c)
 compile_cc     = $(call func_print,CXX,$@) $(cmd_compile_cc)
 compile_rc     = $(call func_print,RC,$@) $(cmd_compile_rc)
 link_c         = $(call func_print,LINK,$@) $(cmd_link_c)
 link_cc                = $(call func_print,LINK,$@) $(cmd_link_cc)
-ar                     = $(call func_print,AR,$@) $(cmd_ar)
-sed                    = $(call func_print,SED,$@) $(cmd_sed)
+ar             = $(call func_print,AR,$@) $(cmd_ar)
+sed            = $(call func_print,SED,$@) $(cmd_sed)
 gzip           = $(call func_print,GZIP,$@) $(cmd_gzip)
 bzip2          = $(call func_print,BZIP2,$@) $(cmd_bzip2)
-xxd                    = $(call func_print,XXD,$@) $(cmd_xxd)
+xxd            = $(call func_print,XXD,$@) $(cmd_xxd)
 configure      = $(call func_print,MAKE,$@) $(cmd_configure)
 dist           = $(call func_print,DIST,$1) $(func_dist)
-install                = $(call func_print,CP,$(DESTDIR)$(3:%/=%)/$(notdir $2)) $(func_install)
+install                = $(call func_print,CP,$(DESTDIR:%/=%)$(3:%/=%)/$(notdir $2)) $(func_install)
 remove         = $(call func_print,RM,$1) $(func_remove)
 
 ifeq (1,$V)
-Q                      =
+Q              =
 func_print     =
 else
-Q                      = @
+Q              = @
 func_print     = printf "\x20\x20$1\t%s\n" $2;
 endif
 
@@ -214,7 +214,8 @@ install-data: $(DATA_TARGETS)
        $(Q)$(foreach d,$(SUBDIRS),$(foreach f,$(pkgdatadir_$d),\
                $(call install,644,$f,$(dir $(f:$d%=$(pkgdatadir)%)));))
        $(Q)$(foreach d,$(SUBDIRS),$(foreach f,$(mandir_$d),\
-               $(call install,644,$f,$(dir $(f:$d%=$(mandir)/man$(shell echo "$f" | sed 's/[^.]*\.\([^.]*\).*/\1/')%)));))
+               $(call install,644,$f,\
+               $(dir $(f:$d%=$(mandir)/man$(shell echo "$f" | sed 's/[^.]*\.\([^.]*\).*/\1/')%)));))
 
 install-exec: $(EXEC_TARGETS)
        $(Q)$(foreach d,$(SUBDIRS),$(foreach f,$(bindir_$d),\
@@ -246,7 +247,7 @@ dist: dist-$(archiveFormat)
 # Prevent make from removing any build targets.
 #
 
-.SECONDARY:    $(clean)
+.SECONDARY: $(clean)
 
 .PHONY: all clean distclean install install-data install-exec
 .PHONY: install-desktop-entry
This page took 0.024669 seconds and 4 git commands to generate.