commit 43035f2

Michael Forney  ·  2013-11-20 01:46:36 +0000 UTC
parent 532b1da
Move dependencies to respective subdirectories
4 files changed,  +23, -17
+9, -0
 1@@ -18,5 +18,14 @@ $(dir)/%.o: $(dir)/%.c | .deps/$(dir)
 2 $(dir)/%.lo: $(dir)/%.c | .deps/$(dir)
 3 	$(compile) -fPIC $($(@D)_CFLAGS) $($(@D)_PACKAGE_CFLAGS)
 4 
 5+ifdef $(dir)_PACKAGES
 6+    ifndef $(dir)_PACKAGE_CFLAGS
 7+        $(dir)_PACKAGE_CFLAGS := $(shell $(PKG_CONFIG) --cflags $($(dir)_PACKAGES))
 8+    endif
 9+    ifndef $(dir)_PACKAGE_LIBS
10+        $(dir)_PACKAGE_LIBS := $(shell $(PKG_CONFIG) --libs $($(dir)_PACKAGES))
11+    endif
12+endif
13+
14 CLEAN_FILES += $($(dir)_TARGETS)
15 
+0, -17
 1@@ -15,20 +15,3 @@ WAYLAND_SCANNER = wayland-scanner
 2 ENABLE_STATIC   = 1
 3 ENABLE_SHARED   = 1
 4 
 5-# Dependencies
 6-SWC_PACKAGES    =   \
 7-    wayland-server  \
 8-    libudev         \
 9-    libevdev        \
10-    xkbcommon       \
11-    libdrm          \
12-    pixman-1        \
13-    wld
14-LAUNCH_PACKAGES =   \
15-    libdrm
16-
17-libswc_PACKAGE_CFLAGS   = $$($(PKG_CONFIG) --cflags $(SWC_PACKAGES))
18-libswc_PACKAGE_LIBS     = $$($(PKG_CONFIG) --libs $(SWC_PACKAGES))
19-launch_PACKAGE_CFLAGS   = $$($(PKG_CONFIG) --cflags $(LAUNCH_PACKAGES))
20-launch_PACKAGE_LIBS     = $$($(PKG_CONFIG) --libs $(LAUNCH_PACKAGES))
21-
+4, -0
 1@@ -4,6 +4,10 @@ dir := launch
 2 
 3 $(dir)_TARGETS := $(dir)/swc-launch
 4 
 5+# Dependencies
 6+$(dir)_PACKAGES =   \
 7+    libdrm
 8+
 9 $(dir)/swc-launch: $(dir)/launch.o $(dir)/protocol.o
10 	$(link) $(launch_PACKAGE_LIBS)
11 
+10, -0
 1@@ -18,6 +18,16 @@ $(dir)_SHARED_TARGETS :=            \
 2 $(dir)_TARGETS += libswc-shared
 3 endif
 4 
 5+# Dependencies
 6+$(dir)_PACKAGES =   \
 7+    libdrm          \
 8+    libevdev        \
 9+    libudev         \
10+    pixman-1        \
11+    wayland-server  \
12+    wld             \
13+    xkbcommon
14+
15 SWC_SOURCES =                       \
16     libswc/compositor.c             \
17     libswc/util.c                   \