Skip to content

Commit 1a9c57f

Browse files
committed
Merge pull request #48 from dgrove-oss/fix-distcheck
SR-438: 'make distcheck' fails for libdispatch on Linux
2 parents 8beb877 + 91268ec commit 1a9c57f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ AM_CXXFLAGS=$(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
5757
AM_OBJCXXFLAGS=$(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
5858

5959
if BUILD_OWN_PTHREAD_WORKQUEUES
60-
PTHREAD_WORKQUEUE_LIBS=../libpwq/libpthread_workqueue.la
61-
PTHREAD_WORKQUEUE_CFLAGS=-I../libpwq/include
60+
PTHREAD_WORKQUEUE_LIBS=$(top_builddir)/libpwq/libpthread_workqueue.la
61+
PTHREAD_WORKQUEUE_CFLAGS=-I$(top_srcdir)/libpwq/include
6262
else
6363
if HAVE_PTHREAD_WORKQUEUES
6464
PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue

tests/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ libbsdtests_la_SOURCES= \
1010
bsdtests.c \
1111
bsdtests.h \
1212
dispatch_test.c \
13-
dispatch_test.h
13+
dispatch_test.h \
14+
linux_port.h
1415

1516
check_PROGRAMS= \
1617
bsdtestharness \

0 commit comments

Comments
 (0)