diff options
| author | Philip Tricca <philip.b.tricca@intel.com> | 2018-03-13 18:19:42 -0700 |
|---|---|---|
| committer | Philip Tricca <philip.b.tricca@intel.com> | 2018-03-14 17:29:15 -0700 |
| commit | d5a6ff48f7c7ac1b356162b006a37e90a2552dd4 (patch) | |
| tree | 4755c7389c83590a66e172b42cc350d11fc5a2dd /Makefile.am | |
| parent | 49635f45fc6119ea7e8985f39d736fa2f3584a2d (diff) | |
| download | tpm2-tss-d5a6ff48f7c7ac1b356162b006a37e90a2552dd4.tar.gz | |
build: Simplify tss2-sys directory structure.
The reason for this change boils down to "too many directories". This
commit removes the `include/` and `sysapi_util` directories. All of
these files are now located directly under `$(srcdir)/src/tss2-sys`. The
templace code that is effectively the "API" is now under
`$(srcdir)/src/tss2-sys/api`.
Signed-off-by: Philip Tricca <philip.b.tricca@intel.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index cf72f211..ce7dc054 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ #;**********************************************************************; ### Initialize global variables used throughout the file ### -INCLUDE_DIRS = -I$(srcdir) -I$(srcdir)/src -I$(srcdir)/include/tss2 +INCLUDE_DIRS = -I$(srcdir)/src -I$(srcdir)/include/tss2 ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = $(INCLUDE_DIRS) $(EXTRA_CFLAGS) $(CODE_COVERAGE_CFLAGS) AM_LDFLAGS = $(EXTRA_LDFLAGS) $(CODE_COVERAGE_LIBS) @@ -147,7 +147,7 @@ lib_LTLIBRARIES += $(libtss2_sys) nodist_pkgconfig_DATA += lib/tss2-sys.pc EXTRA_DIST += lib/tss2-sys.pc.in -src_tss2_sys_libtss2_sys_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-sys/include +src_tss2_sys_libtss2_sys_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-sys src_tss2_sys_libtss2_sys_la_LIBADD = $(libtss2_mu) src_tss2_sys_libtss2_sys_la_SOURCES = $(TSS2_SYS_SRC) @@ -161,7 +161,7 @@ EXTRA_DIST += lib/tss2-esys.pc.in src_tss2_esys_libtss2_esys_la_CFLAGS = $(AM_CFLAGS) \ -Wno-unused-variable -Wno-unused-label \ - -I$(srcdir)/src/tss2-sys/include -I$(srcdir)/src/tss2-esys/esapi_util \ + -I$(srcdir)/src/tss2-sys -I$(srcdir)/src/tss2-esys/esapi_util \ -DESYS_TCTI_DEFAULT_MODULE=$(TCTI_DEFAULT_MODULE) \ -DESYS_TCTI_DEFAULT_CONFIG=$(TCTI_DEFAULT_CONFIG) src_tss2_esys_libtss2_esys_la_LIBADD = $(libtss2_sys) $(libtss2_mu) \ |