diff options
| author | John Stebbins <[email protected]> | 2019-09-11 09:56:06 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2019-09-12 10:22:07 -0700 |
| commit | 1b7948495fcf4d511e62d7f9c3a0c1a3ccb59f80 (patch) | |
| tree | c87c308f35d862678a4bca37637d24acb8de1c2c /libhb/module.defs | |
| parent | a7f548861f9f0be309659e93eaccd1994a3a5cfe (diff) | |
libhb: resolve header conflicts with pango/harfbuzz
Newest versions appear to have a "common.h" somewhere that is
interfering with libhb/common.h.
move headers into "handbrake" subdirectory
Diffstat (limited to 'libhb/module.defs')
| -rw-r--r-- | libhb/module.defs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index e76358f39..a2d444447 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -15,7 +15,7 @@ $(eval $(call import.GCC,LIBHB)) LIBHB.src/ = $(SRC/)libhb/ LIBHB.build/ = $(BUILD/)libhb/ -LIBHB.m4.in = $(wildcard $(LIBHB.src/)*.m4) +LIBHB.m4.in = $(wildcard $(LIBHB.src/)handbrake/*.m4) LIBHB.m4.out = $(patsubst $(LIBHB.src/)%.m4,$(LIBHB.build/)%,$(LIBHB.m4.in)) LIBHB.c = $(wildcard $(LIBHB.src/)*.c) @@ -24,7 +24,7 @@ LIBHB.m.o = $(patsubst $(SRC/)%.m,$(BUILD/)%.o,$(LIBHB.m)) LIBHB.d = $(LIBHB.m4.out) $(LIBHB.h.out) \ $(foreach n,$(LIBHB.prerequisites),$($n.INSTALL.target) ) -LIBHB.h.in = $(wildcard $(LIBHB.src/)*.h) +LIBHB.h.in = $(wildcard $(LIBHB.src/)handbrake/*.h) LIBHB.h.in += $(wildcard $(LIBHB.src/)extras/*.h) LIBHB.h.out = $(patsubst $(SRC/)%,$(BUILD/)%,$(LIBHB.h.in)) |