diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2021-11-13 00:27:17 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2021-11-13 00:27:17 +0300 |
| commit | 46be6c58ad63105d9e4ef9a818cd0b5709c626af (patch) | |
| tree | d138aa2b0241b7ba7952dec97e556821834445f0 /Makefile.am | |
| parent | f9ebf03c7d279ea744c6206b3b045457d5af0d82 (diff) | |
| download | bdwgc-46be6c58ad63105d9e4ef9a818cd0b5709c626af.tar.gz | |
Move non-cord [pkg]include_HEADERS assignments to include.am
(refactoring)
* Makefile.am [PTHREADS || ENABLE_GCJ_SUPPORT || ENABLE_DISCLAIM]
(pkginclude_HEADERS): Move item addition to include/include.am.
* Makefile.am [CPLUSPLUS] (pkginclude_HEADERS, include_HEADERS):
Likewise.
* Makefile.am (EXTRA_DIST): Move msvc_dbg.h item to include/include.am;
remove TODO about the use of Makefile.am with MS VC.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index f557fe12..b1fe3a10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,18 +114,6 @@ endif ## End of !SINGLE_GC_OBJ endif -if PTHREADS -pkginclude_HEADERS += include/gc_pthread_redirects.h -endif - -if ENABLE_GCJ_SUPPORT -pkginclude_HEADERS += include/gc_gcj.h -endif - -if ENABLE_DISCLAIM -pkginclude_HEADERS += include/gc_disclaim.h -endif - if USE_INTERNAL_LIBATOMIC_OPS nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c endif @@ -148,8 +136,6 @@ if CPLUSPLUS # C++ Interface # ------------- lib_LTLIBRARIES += libgccpp.la -pkginclude_HEADERS += include/gc_allocator.h include/gc_cpp.h -include_HEADERS += include/extra/gc_cpp.h libgccpp_la_SOURCES = gc_badalc.cc gc_cpp.cc libgccpp_la_LIBADD = libgc.la libgccpp_la_LDFLAGS = -version-info $(LIBGCCPP_VER_INFO) -no-undefined @@ -163,9 +149,6 @@ libgctba_la_LDFLAGS = -version-info $(LIBGCCPP_VER_INFO) -no-undefined endif endif -## FIXME: If Visual C++ users use Makefile.am, this should go into -## pkginclude_HEADERS with proper AM_CONDITIONALization. Otherwise -## delete this comment. EXTRA_DIST += gc_badalc.cpp gc_cpp.cpp @@ -230,8 +213,7 @@ EXTRA_DIST += tools/if_mach.c tools/if_not_there.c tools/setjmp_t.c \ extra/symbian/init_global_static_roots.cpp extra/symbian.cpp \ extra/pcr_interface.c extra/real_malloc.c \ extra/Mac_files/datastart.c extra/Mac_files/dataend.c \ - extra/Mac_files/MacOS_config.h \ - include/private/msvc_dbg.h extra/msvc_dbg.c tools/callprocs.sh + extra/Mac_files/MacOS_config.h extra/msvc_dbg.c tools/callprocs.sh # # :GOTCHA: GNU make rule for making .s out of .S is flawed, |