Skip to content

Commit

Permalink
Revert "Remove MKOBJ in favour of MKMOD. (ml)"
Browse files Browse the repository at this point in the history
This reverts commit 4c8aba4.
  • Loading branch information
DaveMielke committed Jan 4, 2018
1 parent 7da1121 commit 9e7d62c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Drivers/Braille/EuroBraille/Makefile.in
Expand Up @@ -28,7 +28,7 @@ SRC_FILES = eu_braille.c eu_clio.c eu_esysiris.c
OBJ_FILES = $(SRC_FILES:.c=.$O)

braille.$O: $(OBJ_FILES)
$(MKMOD) $@ $(OBJ_FILES)
$(MKOBJ) $@ $(OBJ_FILES)

%.$O: $(SRC_DIR)/%.c
$(CC) $(BRL_CFLAGS) -o $@ -c $<
Expand Down
1 change: 1 addition & 0 deletions config.mk.in
Expand Up @@ -253,6 +253,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LDLIBS = $(ICU_LIBS) $(SYSTEM_LIBS) @LIBS@

MKOBJ = @MKOBJ@
MKMOD = @MKMOD@
MKLIB = @MKLIB@
CONFLIBDIR = @CONFLIBDIR@
Expand Down
10 changes: 10 additions & 0 deletions configure.ac
Expand Up @@ -428,6 +428,16 @@ AC_SUBST([can_make_manual])
test "${DOXYGEN}" = "false" && can_make_BrlAPIref=no || can_make_BrlAPIref=yes
AC_SUBST([can_make_BrlAPIref])

AC_CACHE_CHECK([for make relocatable object command], [brltty_cv_prog_mkobj], [dnl
case "${host_os}"
in
*)
brltty_cv_prog_mkobj="\$(LD) -r -o"
;;
esac])
MKOBJ="${brltty_cv_prog_mkobj}"
AC_SUBST([MKOBJ])

AC_CACHE_CHECK([for loadable module creation command], [brltty_cv_prog_mkmod], [dnl
case "${host_os}"
in
Expand Down

0 comments on commit 9e7d62c

Please sign in to comment.