Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 10:57:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move header installs to new FL/Makefile, which is generated by

Browse Source 
configure.

Comment out symlink stuff for Cygwin, and (hopefully) soon for OSX, too.

Add uninstall targets where needed.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1707 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2001-11-19 21:25:35 +00:00
parent 13e7d76397
commit 84e38d4d91
8 changed files with 122 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -48,6 +48,8 @@ CHANGES IN FLTK 1.1.0b6
- Added new fl_create_bitmask() and fl_delete_bitmask() - Added new fl_create_bitmask() and fl_delete_bitmask()
functions that create bitmap objects for masking and functions that create bitmap objects for masking and
bitmap drawing. bitmap drawing.
- Was sending FL_RELEASE events for buttons 4 and 5
under X11, which are only for FL_MOUSEWHEEL.
CHANGES IN FLTK 1.1.0b5 CHANGES IN FLTK 1.1.0b5
FL/Makefile.in
+56
View File
@@ -0,0 +1,56 @@
#
# "$Id: Makefile.in,v 1.1.2.1 2001/11/19 21:25:35 easysw Exp $"
#
# Header makefile for the Fast Light Tool Kit (FLTK).
#
# Copyright 1998-2001 by Bill Spitzak and others.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
#
# Please report all bugs and problems to "fltk-bugs@fltk.org".
#
include ../makeinclude
all:
install:
echo "Installing include files..."
-mkdir -p $(includedir)
rm -rf $(includedir)/FL
mkdir $(includedir)/FL
cp ../FL/*.[hH] $(includedir)/FL
@HLINKS@ cd $(includedir)/FL;\
@HLINKS@ for file in *.H; do\
@HLINKS@ rm -f "`basename $$file H`h";\
@HLINKS@ ln -s $$file "`basename $$file H`h";\
@HLINKS@ done
@HLINKS@ rm -f $(includedir)/FL/fl_file_chooser.H
@HLINKS@ ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H
@HLINKS@ rm -f $(includedir)/FL/fl_file_chooser.h
@HLINKS@ ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h
@HLINKS@ rm -f $(includedir)/Fl
@HLINKS@ ln -s FL $(includedir)/Fl
uninstall:
echo "Uninstalling include files..."
rm -rf $(includedir)/FL
@HLINKS@ rm -f $(includedir)/Fl
#
# End of "$Id: Makefile.in,v 1.1.2.1 2001/11/19 21:25:35 easysw Exp $".
#
Makefile
+10 -4
View File
@@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.12.2.6.2.6 2001/09/30 12:30:13 easysw Exp $" # "$Id: Makefile,v 1.12.2.6.2.7 2001/11/19 21:25:34 easysw Exp $"
# #
# Top-level makefile for the Fast Light Tool Kit (FLTK). # Top-level makefile for the Fast Light Tool Kit (FLTK).
# #
@@ -35,16 +35,22 @@ all: makeinclude
done done
install: makeinclude install: makeinclude
@for dir in $(DIRS); do\ @for dir in FL $(DIRS) documentation; do\
echo "=== installing $$dir ===";\ echo "=== installing $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\ (cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
done done
(cd documentation; $(MAKE) $(MFLAGS) install)
-mkdir -p $(bindir) -mkdir -p $(bindir)
rm -f $(bindir)/fltk-config rm -f $(bindir)/fltk-config
-cp fltk-config $(bindir) -cp fltk-config $(bindir)
-chmod +x $(bindir)/fltk-config -chmod +x $(bindir)/fltk-config
uninstall: makeinclude
@for dir in FL $(DIRS) documentation; do\
echo "=== uninstalling $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
done
rm -f $(bindir)/fltk-config
depend: makeinclude depend: makeinclude
@for dir in $(DIRS); do\ @for dir in $(DIRS); do\
echo "=== making dependencies in $$dir ===";\ echo "=== making dependencies in $$dir ===";\
@@ -73,5 +79,5 @@ configure: configure.in
autoconf autoconf
# #
# End of "$Id: Makefile,v 1.12.2.6.2.6 2001/09/30 12:30:13 easysw Exp $". # End of "$Id: Makefile,v 1.12.2.6.2.7 2001/11/19 21:25:34 easysw Exp $".
# #
configure.in
+7 -3
View File
@@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl dnl
dnl "$Id: configure.in,v 1.33.2.31.2.23 2001/11/18 12:48:38 easysw Exp $" dnl "$Id: configure.in,v 1.33.2.31.2.24 2001/11/19 21:25:35 easysw Exp $"
dnl dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@@ -209,6 +209,8 @@ dnl Restore original LIBS settings...
LIBS="$SAVELIBS" LIBS="$SAVELIBS"
EXEEXT= EXEEXT=
HLINKS=
case $uname in case $uname in
CYGWIN*) CYGWIN*)
dnl Cygwin environment... dnl Cygwin environment...
@@ -216,6 +218,7 @@ case $uname in
CFLAGS="$CFLAGS -DWIN32" CFLAGS="$CFLAGS -DWIN32"
CXXFLAGS="$CXXFLAGS -DWIN32" CXXFLAGS="$CXXFLAGS -DWIN32"
EXEEXT=".exe" EXEEXT=".exe"
HLINKS="#"
if test x$enable_gl != xno; then if test x$enable_gl != xno; then
AC_CHECK_HEADER(GL/gl.h, AC_CHECK_HEADER(GL/gl.h,
AC_DEFINE(HAVE_GL) AC_DEFINE(HAVE_GL)
@@ -305,6 +308,7 @@ case $uname in
esac esac
AC_SUBST(EXEEXT) AC_SUBST(EXEEXT)
AC_SUBST(HLINKS)
AC_SUBST(GLDEMOS) AC_SUBST(GLDEMOS)
AC_SUBST(GLLIB) AC_SUBST(GLLIB)
@@ -516,10 +520,10 @@ else
fi fi
AC_CONFIG_HEADER(config.h:configh.in) AC_CONFIG_HEADER(config.h:configh.in)
AC_OUTPUT(makeinclude fltk-config) AC_OUTPUT(makeinclude fltk-config FL/Makefile)
chmod +x fltk-config chmod +x fltk-config
dnl dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.23 2001/11/18 12:48:38 easysw Exp $". dnl End of "$Id: configure.in,v 1.33.2.31.2.24 2001/11/19 21:25:35 easysw Exp $".
dnl dnl
documentation/Makefile
+12 -2
View File
@@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.9.2.10.2.1 2001/10/24 17:04:30 easysw Exp $" # "$Id: Makefile,v 1.9.2.10.2.2 2001/11/19 21:25:35 easysw Exp $"
# #
# Documentation makefile for the Fast Light Tool Kit (FLTK). # Documentation makefile for the Fast Light Tool Kit (FLTK).
# #
@@ -113,6 +113,7 @@ HTMLFILES = \
glut.html \ glut.html \
forms.html \ forms.html \
osissues.html \ osissues.html \
migration.html \
license.html license.html
MANPAGES = fltk.$(CAT3EXT) fluid.$(CAT1EXT) MANPAGES = fltk.$(CAT3EXT) fluid.$(CAT1EXT)
@@ -150,6 +151,15 @@ install: $(MANPAGES)
cp fltk.man $(mandir)/man3/fltk.3 cp fltk.man $(mandir)/man3/fltk.3
chmod 644 $(mandir)/man3/fltk.3 chmod 644 $(mandir)/man3/fltk.3
uninstall:
rm -rf $(docdir)
rm -f $(mandir)/cat1/fluid.$(CAT1EXT)
rm -f $(mandir)/man1/fluid.1
rm -f $(mandir)/cat3/fltk.$(CAT3EXT)
rm -f $(mandir)/man3/fltk.3
# Base html files are now the readable ones, so this target is not make by # Base html files are now the readable ones, so this target is not make by
# default... # default...
fltk.d/index.html: $(HTMLFILES) fltk.d/index.html: $(HTMLFILES)
@@ -168,5 +178,5 @@ fltk.pdf: $(HTMLFILES)
$(HTMLDOC) -f fltk.pdf --jpeg --compression=9 --duplex --verbose --toclevels 2 --titleimage FL.gif $(HTMLFILES) $(HTMLDOC) -f fltk.pdf --jpeg --compression=9 --duplex --verbose --toclevels 2 --titleimage FL.gif $(HTMLFILES)
# #
# End of "$Id: Makefile,v 1.9.2.10.2.1 2001/10/24 17:04:30 easysw Exp $". # End of "$Id: Makefile,v 1.9.2.10.2.2 2001/11/19 21:25:35 easysw Exp $".
# #
fluid/Makefile
+4 -4
View File
@@ -1,7 +1,7 @@
# #
# "$Id: Makefile,v 1.10.2.6.2.4 2001/11/18 12:48:38 easysw Exp $" # "$Id: Makefile,v 1.10.2.6.2.5 2001/11/19 21:25:35 easysw Exp $"
# #
# Fluid makefile for the Fast Light Tool Kit (FLTK). # FLUID makefile for the Fast Light Tool Kit (FLTK).
# #
# Copyright 1998-2001 by Bill Spitzak and others. # Copyright 1998-2001 by Bill Spitzak and others.
# #
@@ -72,7 +72,7 @@ install: $(PROGRAM)
chmod 755 $(bindir)/$(PROGRAM) chmod 755 $(bindir)/$(PROGRAM)
uninstall: uninstall:
-rm -f $(bindir)/$(PROGRAM) rm -f $(bindir)/$(PROGRAM)
# #
# Note: The rebuild target can only be used if you have the original .fl # Note: The rebuild target can only be used if you have the original .fl
@@ -86,5 +86,5 @@ rebuild:
./fluid -c widget_panel.fl ./fluid -c widget_panel.fl
# #
# End of "$Id: Makefile,v 1.10.2.6.2.4 2001/11/18 12:48:38 easysw Exp $". # End of "$Id: Makefile,v 1.10.2.6.2.5 2001/11/19 21:25:35 easysw Exp $".
# #
src/Makefile
+26 -18
View File
@@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.18.2.14.2.17 2001/11/19 01:06:45 easysw Exp $" # "$Id: Makefile,v 1.18.2.14.2.18 2001/11/19 21:25:35 easysw Exp $"
# #
# Library makefile for the Fast Light Tool Kit (FLTK). # Library makefile for the Fast Light Tool Kit (FLTK).
# #
@@ -253,23 +253,31 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME)
rm -f $(libdir)/libfltk_gl_s.a;\ rm -f $(libdir)/libfltk_gl_s.a;\
cp libfltk_gl_s.a $(libdir); \ cp libfltk_gl_s.a $(libdir); \
fi fi
echo "Installing include files..."
-mkdir -p $(includedir)
rm -rf $(includedir)/FL uninstall:
mkdir $(includedir)/FL echo "Uninstalling libraries..."
cp ../FL/*.[hH] $(includedir)/FL rm -f $(libdir)/$(LIBNAME)
cd $(includedir)/FL;\ if test x$(DSONAME) = xlibfltk.so.1.1; then\
for file in *.H; do\ rm -f $(libdir)/libfltk.so*;\
rm -f "`basename $$file H`h";\ fi
ln -s $$file "`basename $$file H`h";\ if test x$(DSONAME) = xlibfltk.sl.1.1; then\
done rm -f $(libdir)/libfltk.sl*;\
rm -f $(includedir)/FL/fl_file_chooser.H fi
ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H if test x$(DSONAME) = xlibfltk_s.a; then\
rm -f $(includedir)/FL/fl_file_chooser.h rm -f $(libdir)/libfltk_s.a;\
ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h fi
rm -f $(includedir)/Fl if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
ln -s FL $(includedir)/Fl rm -f $(libdir)/libfltk_gl.so*;\
fi
if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
rm -f $(libdir)/libfltk_gl.sl*;\
fi
if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
rm -f $(libdir)/libfltk_gl_s.a;\
fi
# #
# End of "$Id: Makefile,v 1.18.2.14.2.17 2001/11/19 01:06:45 easysw Exp $". # End of "$Id: Makefile,v 1.18.2.14.2.18 2001/11/19 21:25:35 easysw Exp $".
# #
test/Makefile
+5 -2
View File
@@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.19.2.7.2.9 2001/11/19 01:06:45 easysw Exp $" # "$Id: Makefile,v 1.19.2.7.2.10 2001/11/19 21:25:35 easysw Exp $"
# #
# Test/example program makefile for the Fast Light Tool Kit (FLTK). # Test/example program makefile for the Fast Light Tool Kit (FLTK).
# #
@@ -185,6 +185,9 @@ clean:
install: install:
@echo Nothing to install in test directory. @echo Nothing to install in test directory.
uninstall:
@echo Nothing to uninstall in test directory.
# #
# End of "$Id: Makefile,v 1.19.2.7.2.9 2001/11/19 01:06:45 easysw Exp $". # End of "$Id: Makefile,v 1.19.2.7.2.10 2001/11/19 21:25:35 easysw Exp $".
# #