diff options
author | Lubos Lunak <l.lunak@ suse.cz> | 2006-03-16 22:00:57 +0000 |
---|---|---|
committer | Lubos Lunak <l.lunak@ suse.cz> | 2006-03-16 22:00:57 +0000 |
commit | 895d07489d9f99871fab5068edb4f0906d0ae757 (patch) | |
tree | 78b3ab2a4bd9526334ddf399418c3b427aac8446 | |
parent | 2c793b6e2677d555b3f95c28b753f82f293d7400 (diff) |
Fix builddir != srcdir.
-rw-r--r-- | generic/Makefile.am | 2 | ||||
-rw-r--r-- | kde/configure.in.in | 2 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/generic/Makefile.am b/generic/Makefile.am index 17aee41..3ceb02f 100644 --- a/generic/Makefile.am +++ b/generic/Makefile.am @@ -4,4 +4,4 @@ dapi_generic_SOURCES = main.c commands.c dapi_generic_LDADD = ../lib/libdapi.la -lXext -lX11 $(X_EXTRA_LIBS) $(X_PRE_LIBS) dapi_generic_LDFLAGS = $(X_LIBS) -INCLUDES = -I$(top_srcdir)/include $(X_CFLAGS) +INCLUDES = -I$(top_builddir)/include $(X_CFLAGS) diff --git a/kde/configure.in.in b/kde/configure.in.in index ff6ba4a..4906b65 100644 --- a/kde/configure.in.in +++ b/kde/configure.in.in @@ -6,7 +6,7 @@ KDE_CHECK_HEADERS(X11/extensions/dpms.h, LIB_DAPI='$(top_builddir)/../lib/libdapi.la' AC_SUBST(LIB_DAPI) -dapi_includes='-I$(top_srcdir)/../include' +dapi_includes='-I$(top_builddir)/../include' all_includes="$dapi_includes $all_includes" CFLAGS="$CFLAGS -Werror" diff --git a/lib/Makefile.am b/lib/Makefile.am index 14ac76e..3786177 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,4 +4,4 @@ libdapi_la_SOURCES = comm.c calls.c callbacks.c libdapi_la_LIBADD = libdapi_la_LDFLAGS = $(all_libraries) -no-undefined -INCLUDES = -I$(top_srcdir)/include $(all_includes) +INCLUDES = -I$(top_builddir)/include $(all_includes) diff --git a/tests/Makefile.am b/tests/Makefile.am index aad6c92..49195af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,4 +41,4 @@ test_fallback_SOURCES = test_fallback.c test_fallback_LDADD = ../lib/libdapi.la test_fallback_LDFLAGS = $(all_libraries) -INCLUDES = -I$(top_srcdir)/include $(all_includes) +INCLUDES = -I$(top_builddir)/include $(all_includes) |