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.

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

Makefile updates #64

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/make
#
include arch.make
SRCDIR = .
#
default: objsdir $(BUILD_TARGETS) examples_build
@if [ -z "$(BUILD_TARGETS)" ]; then echo "FoX is not configured!"; else touch .FoX; fi
Expand All @@ -9,7 +10,7 @@ objsdir:
mkdir -p objs/lib objs/finclude
#
# Note the hackery to fix the prefix in FoX-config when installed without breaking
# use from the local directory (which would just need a one-line fix in
# use from the local directory (which would just need a one-line fix in
# FoX-config.in). We restore the origional FoX-config so local version still works.
install: objsdir $(BUILD_TARGETS)
$(MKDIR_P) $(install_prefix)/lib $(install_prefix)/finclude $(install_prefix)/bin
Expand Down Expand Up @@ -55,7 +56,7 @@ sax_lib_check: $(BUILD_TARGETS) common_lib utils_lib
touch sax_lib_check.out ; \
fi
#
wxml_lib: objsdir common_lib fsys_lib
wxml_lib: objsdir common_lib fsys_lib
(cd wxml; $(MAKE) VPATH=$(VPATH)/wxml)
wxml_lib_clean:
if test -d wxml; then (cd wxml; $(MAKE) VPATH=$(VPATH)/wxml clean) fi
Expand All @@ -71,7 +72,7 @@ wxml_lib_check: $(BUILD_TARGETS) common_lib utils_lib
#
wcml_lib: objsdir utils_lib wxml_lib
(cd wcml; $(MAKE) VPATH=$(VPATH)/wcml)
wcml_lib_clean:
wcml_lib_clean:
if test -d wcml; then (cd wcml; $(MAKE) VPATH=$(VPATH)/wcml clean) fi
wcml_lib_check: $(BUILD_TARGETS) common_lib utils_lib
if test -d examples && ! grep DUMMYLIB arch.make > /dev/null ; \
Expand Down Expand Up @@ -127,7 +128,7 @@ utils_lib_check: $(BUILD_TARGETS) common_lib utils_lib
fi
#
fsys_lib: objsdir
(cd fsys; $(MAKE) VPATH=$(VPATH)/fsys)
(cd $(SRCDIR)/fsys; $(MAKE) VPATH=$(VPATH)/fsys)
fsys_lib_clean:
if test -d fsys; then (cd fsys; $(MAKE) VPATH=$(VPATH)/fsys clean) fi
#
Expand Down