commit e301f6c

Michael Forney  ·  2013-12-07 09:52:52 +0000 UTC
parent bc2a646
Makefile.* -> *.mk
5 files changed,  +8, -8
+1, -1
1@@ -46,7 +46,7 @@ link        = $(call quiet,CCLD,$(CC)) $(FINAL_CFLAGS) -o $@ $^
2 pkgconfig   = $(sort $(foreach pkg,$(1),$(if $($(pkg)_$(3)),$($(pkg)_$(3)), \
3                                            $(shell $(PKG_CONFIG) --$(2) $(pkg)))))
4 
5-include $(SUBDIRS:%=%/Makefile.local)
6+include $(SUBDIRS:%=%/local.mk)
7 
8 $(foreach dir,BIN LIB INCLUDE PKGCONFIG,$(DESTDIR)$($(dir)DIR)):
9 	mkdir -p "$@"
R Makefile.common => common.mk
+1, -1
1@@ -1,4 +1,4 @@
2-# swc: Makefile.common
3+# swc: common.mk
4 
5 .PHONY: check-dependencies-$(dir)
6 check-dependencies-$(dir):
R launch/Makefile.local => launch/local.mk
+2, -2
 1@@ -1,4 +1,4 @@
 2-# swc: launch/Makefile.local
 3+# swc: launch/local.mk
 4 
 5 dir := launch
 6 
 7@@ -19,5 +19,5 @@ install-$(dir): $(dir)/swc-launch | $(DESTDIR)$(BINDIR)
 8 
 9 CLEAN_FILES += $(dir)/launch.o
10 
11-include Makefile.common
12+include common.mk
13 
R libswc/Makefile.local => libswc/local.mk
+2, -2
 1@@ -1,4 +1,4 @@
 2-# swc: libswc/Makefile.local
 3+# swc: libswc/local.mk
 4 
 5 dir := libswc
 6 
 7@@ -115,5 +115,5 @@ install-libswc: $($(dir)_TARGETS:$(dir)/%=install-%) | $(DESTDIR)$(INCLUDEDIR)
 8 
 9 CLEAN_FILES += $(SWC_SHARED_OBJECTS) $(SWC_STATIC_OBJECTS) $($(dir)_SHARED_TARGETS)
10 
11-include Makefile.common
12+include common.mk
13 
R protocol/Makefile.local => protocol/local.mk
+2, -2
 1@@ -1,4 +1,4 @@
 2-# swc: protocol/Makefile.local
 3+# swc: protocol/local.mk
 4 
 5 dir := protocol
 6 
 7@@ -15,5 +15,5 @@ $(dir)/%-protocol.c: $(dir)/%.xml
 8 $(dir)/%-server-protocol.h: $(dir)/%.xml
 9 	$(call quiet,GEN,$(WAYLAND_SCANNER)) server-header < $< > $@
10 
11-include Makefile.common
12+include common.mk
13