diff options
| author | Oded Gabbay <oded.gabbay@gmail.com> | 2015-10-04 10:23:30 +0300 |
|---|---|---|
| committer | Oded Gabbay <oded.gabbay@gmail.com> | 2015-10-04 10:58:11 +0300 |
| commit | c214a227dc9af42050f44c7f55498f37449dd574 (patch) | |
| tree | b246f90ff6e0f0405097eac1a74b72de07896098 | |
| parent | 369325d9d551eb8f16279eb4c562c05223b4d5bc (diff) | |
restore original paths
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | hsakmt/Makefile.am | 13 | ||||
| -rw-r--r-- | hsakmt/Makefile.sources | 4 | ||||
| -rw-r--r-- | hsakmt/include/hsakmt.h (renamed from hsakmt/hsakmt.h) | 0 | ||||
| -rw-r--r-- | hsakmt/include/hsakmttypes.h (renamed from hsakmt/hsakmttypes.h) | 0 | ||||
| -rw-r--r-- | hsakmt/include/linux/kfd_ioctl.h (renamed from hsakmt/kfd_ioctl.h) | 0 |
6 files changed, 16 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1349403..2695814 100644 --- a/configure.ac +++ b/configure.ac @@ -260,11 +260,14 @@ fi AC_MSG_RESULT($support_for_pthreads) +# distribute additional compiler and linker flags among Makefiles +# --> set and change these variables instead of CXXFLAGS or LDFLAGS (for user only) AC_SUBST(TOOLCHAIN_SUPPORTS__THREAD) AC_SUBST(HAVE_PTHREADS) AC_SUBST(PTHREAD_LDFLAGS) AC_SUBST(PTHREAD_LIBS) AC_SUBST(PTHREAD_CFLAGS) +AC_SUBST(AM_CFLAGS) # Checks for library functions. diff --git a/hsakmt/Makefile.am b/hsakmt/Makefile.am index 2d649c5..db5d58c 100644 --- a/hsakmt/Makefile.am +++ b/hsakmt/Makefile.am @@ -1,5 +1,14 @@ include $(top_srcdir)/hsakmt/Makefile.sources +ext_inc_dir = $(top_srcdir)/hsakmt/include + +# additional include paths necessary to compile the C library +AM_CFLAGS = -I$(ext_inc_dir) @AM_CFLAGS@ + +############################################################################### +# THE LIBRARIES TO BUILD +############################################################################### + lib_LTLIBRARIES = libhsakmt-1.la libhsakmt_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined @PTHREAD_LDFLAGS@ @@ -7,8 +16,8 @@ libhsakmt_1_la_LIBADD = @PTHREAD_LIBS@ -lm libhsakmt_1_la_SOURCES = $(libhsakmt_sources) $(libhsakmt_headers) libhsakmtincludedir = $(includedir)/hsakmt-1 -libhsakmtinclude_HEADERS = hsakmt.h hsakmttypes.h kfd_ioctl.h hsakmt-version.h +libhsakmtinclude_HEADERS = $(ext_inc_dir)/hsakmt.h $(ext_inc_dir)/hsakmttypes.h noinst_LTLIBRARIES = .c.s : $(libhsakmtinclude_HEADERS) - $(CC) $(CFLAGS) $(ASM_CFLAGS_$(@:hsakmt-%.s=%)) -DHAVE_CONFIG_H -I$(srcdir) -I$(builddir) -I$(top_builddir) -S -o $@ $< + $(CC) $(CFLAGS) $(ASM_CFLAGS_$(@:hsakmt-%.s=%)) -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/include -I$(builddir) -I$(top_builddir) -S -o $@ $< diff --git a/hsakmt/Makefile.sources b/hsakmt/Makefile.sources index 4285792..29bb57f 100644 --- a/hsakmt/Makefile.sources +++ b/hsakmt/Makefile.sources @@ -17,9 +17,9 @@ libhsakmt_sources = \ libhsakmt_headers = \ fmm.h \ + libhsakmt.h \ + pmc_table.h \ hsakmt.h \ hsakmttypes.h \ kfd_ioctl.h \ - libhsakmt.h \ - pmc_table.h \ $(NULL) diff --git a/hsakmt/hsakmt.h b/hsakmt/include/hsakmt.h index c87b3f8..c87b3f8 100644 --- a/hsakmt/hsakmt.h +++ b/hsakmt/include/hsakmt.h diff --git a/hsakmt/hsakmttypes.h b/hsakmt/include/hsakmttypes.h index a7e0a81..a7e0a81 100644 --- a/hsakmt/hsakmttypes.h +++ b/hsakmt/include/hsakmttypes.h diff --git a/hsakmt/kfd_ioctl.h b/hsakmt/include/linux/kfd_ioctl.h index d683342..d683342 100644 --- a/hsakmt/kfd_ioctl.h +++ b/hsakmt/include/linux/kfd_ioctl.h |