Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install only headers required by julia.h #17745

Closed
wants to merge 1 commit into from
Closed

Install only headers required by julia.h #17745

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,25 @@ define stringreplace
$(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
endef

JL_HEADERS := \
Copy link
Contributor

@tkelman tkelman Aug 2, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My prior feedback is now collapsed at #17745 (comment) still applies, I don't like this form where JL_HEADERS needs to be kept up to date. A shorter exclusions list of things that are currently included in src/support/*.h but aren't needed would be more maintainable.

src/julia.h \
src/julia_threads.h \
src/julia_version.h \
src/support/arraylist.h \
src/support/bitvector.h \
src/support/dirpath.h \
src/support/dtypes.h \
src/support/hashing.h \
src/support/htable.h \
src/support/ios.h \
src/support/libsupport.h \
src/support/platform.h \
src/support/ptrhash.h \
src/support/strtod.h \
src/support/timefuncs.h \
src/support/utf8.h \
src/support/utils.h

install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html
@$(MAKE) $(QUIET_MAKE) all
@for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
Expand Down Expand Up @@ -372,7 +391,7 @@ ifeq ($(OS),WINNT)
endif
$(INSTALL_F) $(build_includedir)/uv* $(DESTDIR)$(includedir)/julia
endif
$(INSTALL_F) $(addprefix $(JULIAHOME)/,src/julia.h src/julia_threads.h src/julia_version.h src/support/*.h) $(DESTDIR)$(includedir)/julia
$(INSTALL_F) $(addprefix $(JULIAHOME)/,$(JL_HEADERS)) $(DESTDIR)$(includedir)/julia
# Copy system image
-$(INSTALL_F) $(build_private_libdir)/sys.ji $(DESTDIR)$(private_libdir)
$(INSTALL_M) $(build_private_libdir)/sys.$(SHLIB_EXT) $(DESTDIR)$(private_libdir)
Expand Down