diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-11-28 15:08:36 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-11-28 15:08:36 +0000 |
| commit | bbb5a69f0f2348adbbb8db960e5e45306b865683 (patch) | |
| tree | 23f3039b350d61a402f3af97e8cc3ec06f08797e /src/lib/Makefile.in | |
| parent | ab86c48186a05391f1c1fbc3f90759cc0caff45b (diff) | |
| download | open-axiom-bbb5a69f0f2348adbbb8db960e5e45306b865683.tar.gz | |
* lib/Makefile.in: Build libopen-axiom-core and libspad with a C++
compiler and linker.
* lib/bsdsignal.c: Fix C calling convention annotation.
* lib/cfuns-c.c: Likewise.
* lib/edin.c: Likewise.
* lib/sockio-c.c: Likewise.
* include/bsdsignal.h: Remove 'extern "C"'-block annotation.
* include/cfuns.h: Likewise.
* include/cursor.h: Likewise.
* include/edin.h: Likewise.
* include/fnct_key.h: Likewise.
* include/halloc.h: Likewise.
* include/hash.h: Likewise.
* include/openpty.h: Likewise.
* include/pixmap.h: Likewise.
* include/prt.h: Likewise.
* include/sockio.h: Likewise.
* include/spadcolors.h: Likewise.
* include/util.H1: Likewise.
* include/view.h: Likewise.
* include/wct.h: Likewise.
* include/open-axiom.h (OPENAXIOM_C_CALL): New macro.
(OPENAXIOM_C_EXPORT): Likewise.
Diffstat (limited to 'src/lib/Makefile.in')
| -rw-r--r-- | src/lib/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 53027039..25b8be68 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008, Gabriel Dos Reis. +# Copyright (C) 2007-2010, Gabriel Dos Reis. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -86,20 +86,20 @@ $(axiom_target_libdir)/libopen-axiom-core.$(LIBEXT): \ $(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \ $(libopen_axiom_core_objects) $(mkdir_p) $(axiom_target_libdir) - $(LINK_SHRLIB) $(oa_shrlib_flags) -o $@ \ + $(CXXLINK_SHRLIB) $(oa_shrlib_flags) -o $@ \ $(libopen_axiom_core_objects) \ @oa_c_runtime_extra@ -lm libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_SOURCES:.c=.lo) - $(LINK) -o $@ $(libopen_axiom_core_SOURCES:.c=.lo) + $(CXXLINK) -o $@ $(libopen_axiom_core_SOURCES:.c=.lo) libspad.$(LIBEXT): $(libspad_objects) - $(LINK) -o $@ $(libspad_objects) + $(CXXLINK) -o $@ $(libspad_objects) .PRECIOUS: %.$(OBJEXT) %.$(OBJEXT) %.lo: %.c $(axiom_c_macros_h) - $(COMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CFLAGS) \ + $(CXXCOMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CFLAGS) \ $(axiom_includes) $(AXIOM_X11_CFLAGS) $< # This is a support library, so it does not change often and |