In the configuration setp, LIBNAME (which contains the local path of the library as seen from the src directory) was used wrong. I added LIBBASENAME, the true library name without the path, and replaced LIBNAME wherever it was used wrongly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6611 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
parent
7180c24f3c
commit
6b3f61e3ff
14
configure.in
14
configure.in
@ -99,6 +99,12 @@ GLLIBNAME="../lib/libfltk_gl.a"
|
||||
IMGLIBNAME="../lib/libfltk_images.a"
|
||||
CAIROLIBNAME="../lib/libfltk_cairo.a"
|
||||
|
||||
LIBBASENAME="libfltk.a"
|
||||
FLLIBBASENAME="libfltk_forms.a"
|
||||
GLLIBBASENAME="libfltk_gl.a"
|
||||
IMGLIBBASENAME="libfltk_images.a"
|
||||
CAIROLIBBASENAME="libfltk_cairo.a"
|
||||
|
||||
AC_SUBST(FLLIBNAME)
|
||||
AC_SUBST(GLDEMOS)
|
||||
AC_SUBST(GLLIBNAME)
|
||||
@ -111,6 +117,12 @@ AC_SUBST(LINKFLTKFORMS)
|
||||
AC_SUBST(LINKFLTKGL)
|
||||
AC_SUBST(LINKFLTKIMG)
|
||||
|
||||
AC_SUBST(LIBBASENAME)
|
||||
AC_SUBST(FLLIBBASENAME)
|
||||
AC_SUBST(GLLIBBASENAME)
|
||||
AC_SUBST(IMGLIBBASENAME)
|
||||
AC_SUBST(CAIROLIBBASENAME)
|
||||
|
||||
dnl Handle compile-time options...
|
||||
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]])
|
||||
if test x$enable_debug = xyes; then
|
||||
@ -128,7 +140,7 @@ LINKFLTKCAIRO=""
|
||||
FLTKCAIROOPTION=""
|
||||
CAIROLIBS=""
|
||||
|
||||
AC_ARG_ENABLE(cairo,[ --enable-cairoext use fltk code instrumentation for cairo extended use (default=no)])
|
||||
AC_ARG_ENABLE(cairo,[ --enable-cairoext use fltk code instrumentation for cairo extended use (default=no)])
|
||||
if test x$enable_cairoext = xyes; then
|
||||
AC_DEFINE(USE_CAIRO)
|
||||
AC_DEFINE(HAVE_CAIRO)
|
||||
|
||||
@ -54,8 +54,8 @@ include ../makeinclude
|
||||
|
||||
all: $(FLUID) fluid$(EXEEXT)
|
||||
|
||||
fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
|
||||
../lib/$(IMGLIBNAME)
|
||||
fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
|
||||
$(IMGLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
|
||||
|
||||
@ -75,6 +75,12 @@ IMGDSONAME = @IMGDSONAME@
|
||||
CAIRODSONAME = @CAIRODSONAME@
|
||||
DSOCOMMAND = @DSOCOMMAND@
|
||||
|
||||
LIBBASENAME = @LIBBASENAME@
|
||||
FLLIBBASENAME = @FLLIBBASENAME@
|
||||
GLLIBBASENAME = @GLLIBBASENAME@
|
||||
IMGLIBBASENAME = @IMGLIBBASENAME@
|
||||
CAIROLIBBASENAME= @CAIROLIBBASENAME@
|
||||
|
||||
# libraries to link with:
|
||||
AUDIOLIBS = @AUDIOLIBS@
|
||||
CAIROLIBS = @CAIROLIBS@
|
||||
|
||||
18
src/Makefile
18
src/Makefile
@ -504,17 +504,17 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
echo "Installing libraries in $(DESTDIR)$(libdir)..."
|
||||
-$(INSTALL_DIR) $(DESTDIR)$(libdir)
|
||||
-$(INSTALL_DIR) $(DESTDIR)$(bindir)
|
||||
$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
|
||||
$(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
|
||||
$(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
|
||||
$(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
|
||||
$(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME)
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME)
|
||||
if test x$(GLLIBNAME) != x; then \
|
||||
$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
|
||||
fi
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
|
||||
if test x$(DSONAME) = xlibfltk.so.1.3; then\
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
|
||||
$(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \
|
||||
@ -643,7 +643,7 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
|
||||
uninstall:
|
||||
echo "Uninstalling libraries..."
|
||||
$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
|
||||
$(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
|
||||
if test x$(DSONAME) = xlibfltk.so.1.3; then\
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
|
||||
fi
|
||||
@ -664,7 +664,7 @@ uninstall:
|
||||
$(RM) $(DESTDIR)$(bindir)/$(DSONAME); \
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
|
||||
fi
|
||||
$(RM) $(DESTDIR)$(libdir)/$(FLLIBNAME);
|
||||
$(RM) $(DESTDIR)$(libdir)/$(FLLIBBASENAME);
|
||||
if test x$(FLDSONAME) = xlibfltk_forms.so.1.3; then\
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
|
||||
fi
|
||||
@ -686,7 +686,7 @@ uninstall:
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
|
||||
fi
|
||||
if test x$(GLLIBNAME) != x; then\
|
||||
$(RM) $(DESTDIR)$(libdir)/$(GLLIBNAME);\
|
||||
$(RM) $(DESTDIR)$(libdir)/$(GLLIBBASENAME);\
|
||||
fi
|
||||
if test x$(GLDSONAME) = xlibfltk_gl.so.1.3; then\
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
|
||||
@ -709,7 +709,7 @@ uninstall:
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
|
||||
fi
|
||||
if test x$(IMGLIBNAME) != x; then\
|
||||
$(RM) $(DESTDIR)$(libdir)/$(IMGLIBNAME);\
|
||||
$(RM) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME);\
|
||||
fi
|
||||
if test x$(IMGDSONAME) = xlibfltk_images.so.1.3; then\
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
|
||||
|
||||
@ -259,7 +259,7 @@ uninstall-osx:
|
||||
../fluid/fluid$(EXEEXT) -c $<
|
||||
|
||||
# All demos depend on the FLTK library...
|
||||
$(ALL): ../lib/$(LIBNAME)
|
||||
$(ALL): $(LIBNAME)
|
||||
|
||||
# General demos...
|
||||
unittests$(EXEEXT): unittests.o
|
||||
@ -315,7 +315,7 @@ editor$(EXEEXT): editor.o
|
||||
fast_slow$(EXEEXT): fast_slow.o
|
||||
fast_slow.cxx: fast_slow.fl ../fluid/fluid$(EXEEXT)
|
||||
|
||||
file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME)
|
||||
file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
|
||||
@ -327,7 +327,7 @@ forms$(EXEEXT): forms.o
|
||||
|
||||
hello$(EXEEXT): hello.o
|
||||
|
||||
help$(EXEEXT): help.o ../lib/$(IMGLIBNAME)
|
||||
help$(EXEEXT): help.o $(IMGLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
|
||||
@ -370,7 +370,7 @@ minimum$(EXEEXT): minimum.o
|
||||
|
||||
navigation$(EXEEXT): navigation.o
|
||||
|
||||
output$(EXEEXT): output.o ../lib/$(FLLIBNAME)
|
||||
output$(EXEEXT): output.o $(FLLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
|
||||
@ -380,7 +380,7 @@ pack$(EXEEXT): pack.o
|
||||
|
||||
pixmap$(EXEEXT): pixmap.o
|
||||
|
||||
pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME)
|
||||
pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
|
||||
@ -427,7 +427,7 @@ valuators$(EXEEXT): valuators.o
|
||||
valuators.cxx: valuators.fl ../fluid/fluid$(EXEEXT)
|
||||
|
||||
# All OpenGL demos depend on the FLTK and FLTK_GL libraries...
|
||||
$(GLALL): ../lib/$(LIBNAME) ../lib/$(GLLIBNAME)
|
||||
$(GLALL): $(LIBNAME) $(GLLIBNAME)
|
||||
|
||||
# OpenGL demos...
|
||||
CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
|
||||
|
||||
Loading…
Reference in New Issue
Block a user