Skip to content

Commit

Permalink
Fix 1.1.x makefile - it had the wrong depend target (Bill, you can use
Browse files Browse the repository at this point in the history
makedepend or "-I" with no directory with your 2.0 target to eliminate
the system include files...) and thus the dependency file contained
system headers in it...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1993 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
michaelrsweet committed Mar 8, 2002
1 parent 6660f52 commit 35b3c47
Show file tree
Hide file tree
Showing 2 changed files with 484 additions and 9 deletions.
13 changes: 4 additions & 9 deletions src/Makefile
@@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.18.2.14.2.36 2002/03/07 19:22:57 spitzak Exp $"
# "$Id: Makefile,v 1.18.2.14.2.37 2002/03/08 13:13:14 easysw Exp $"
#
# Library makefile for the Fast Light Tool Kit (FLTK).
#
Expand Down Expand Up @@ -174,8 +174,6 @@ CLEAN = core cmap
################################################################

include ../makeinclude
CFLAGS += -DFL_LIBRARY
CXXFLAGS += -DFL_LIBRARY

OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
GLOBJECTS = $(GLCPPFILES:.cxx=.o)
Expand Down Expand Up @@ -221,11 +219,8 @@ libfltk_gl_s.a: $(GLOBJECTS)
clean :
-@ rm -f *.o $(DSONAME) $(GLDSONAME) $(LIBRARY) $(CLEAN) libfltk.so libfltk_gl.so

depend:
$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) $(GLCPPFILES) $(CFILES) > makedepend
sed -e "s'\.o'_s\.o'" makedepend > foo
cat foo >> makedepend
rm foo
depend: $(CPPFILES) $(GLCPPFILES) $(CFILES)
makedepend -Y -I.. -f makedepend $(CPPFILES) $(GLCPPFILES) $(CFILES)

# Automatically generated dependencies...
include makedepend
Expand Down Expand Up @@ -358,5 +353,5 @@ uninstall:


#
# End of "$Id: Makefile,v 1.18.2.14.2.36 2002/03/07 19:22:57 spitzak Exp $".
# End of "$Id: Makefile,v 1.18.2.14.2.37 2002/03/08 13:13:14 easysw Exp $".
#

0 comments on commit 35b3c47

Please sign in to comment.