New Makefile for os X, compatible with Mac OS X 10.2

1 files changed, 71 insertions, 29 deletions

diff --git a/src/Makefile.osx b/src/Makefile.osx
index c2a95c7..3825756 100644
--- a/src/Makefile.osx
+++ b/src/Makefile.osx
@@ -2,7 +2,7 @@
 #	Ivy, C interface
 #
 #	Copyright (C) 1997-1999
-#	Centre d'Études de la Navigation Aérienne
+#	Centre d'Etudes de la Navigation Aérienne
 #
 # 	Makefile for OS X
 #
@@ -15,78 +15,120 @@
 #
 
 
+
 MAJOR=3
-MINOR=1
+MINOR=4
 
-CC=cc
-CFLAGS =  -g #-DDEBUG for debug 
+CC=gcc
+CFLAGS = -g
 OBJ = ivyloop.o timer.o ivysocket.o ivy.o 
 GOBJ = ivyloop.o timer.o ivysocket.o givy.o
-TCLOBJ = ivytcl.o ivysocket.o givy.o
+#GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o
+#TCLOBJ = ivytcl.o ivysocket.o givy.o
 TARGETS = ivyprobe
+# not yiet need Modified Glut ivyglutprobe
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c
 
 all: static-libs commands shared-libs
 
-static-libs: libivy.a 
-
-shared-libs: libivy.$(MAJOR).$(MINOR).dylib 
+static-libs: libivy.a #libgivy.a libxtivy.a libgtkivy.a libtclivy.a 
+# not yiet need Modified Glut libglutivy.a
 
-tcl-exts: ivytcl.so.$(MAJOR).$(MINOR)
+shared-libs: libivy.$(MAJOR).$(MINOR).dylib #libivy.so.$(MAJOR).$(MINOR) #libgivy.so.$(MAJOR).$(MINOR)
+# not yiet need Modified Glut libglutivy.so.$(MAJOR).$(MINOR)
 
 commands: $(TARGETS)
 
 givy.o: ivy.c
 	$(CC) -DGNU_REGEXP -c $(CFLAGS) -o givy.o ivy.c
 
+#ivyglutloop.o: ivyglutloop.c ivyglutloop.h
+#	$(CC) -c $(CFLAGS) $(GLUTINC) -o ivyglutloop.o ivyglutloop.c
+
 ivyprobe: ivyprobe.o libivy.a
 	$(CC)  $(CFLAGS) -o ivyprobe ivyprobe.o -L. -livy
 
+#ivyglutprobe.o : ivyprobe.c
+#	$(CC)  $(CFLAGS) -c ivyprobe.c -o ivyglutprobe.o $(GLUTINC) -DGLUTMAINLOOP
+
+#ivyglutprobe: ivyglutprobe.o libglutivy.a
+#	$(CC) -o ivyglutprobe ivyglutprobe.o -L. $(GLUTLIB) -lglutivy -lglut -lGLU -lGL -lX11 -lXmu
+
 libivy.a: $(OBJ)
 	rm -f $@
+#	ar q $@ $(OBJ)
 	ar r $@ $(OBJ)
 	ranlib $@
 
 libgivy.a: $(GOBJ)
 	rm -f $@
+#	ar q $@ $(GOBJ)
 	ar r $@ $(GOBJ)
 
+#libglutivy.a: $(GLUTOBJ)
+#	rm -f $@
+#	ar cq $@ $(GLUTOBJ)
+
 libivy.$(MAJOR).$(MINOR).dylib: $(OBJ)
 	$(CC) -dynamiclib -o $@ $(OBJ) -lc
 
-ivytcl.so.$(MAJOR).$(MINOR): $(TCLOBJ)
-	#$(CC) -shared -Wl,-soname,ivytcl.so.$(MAJOR) -o $@ \
-	$(CC) -dynamiclib -o $@ \
+#libivy.so.$(MAJOR).$(MINOR): $(OBJ)
+#	$(CC) -shared -Wl,-soname,libivy.so.$(MAJOR) -o $@ $(OBJ) -lc
 
-	$(TCLOBJ) -L$(TCLLIB) -ltcl -lc
+#libgivy.so.$(MAJOR).$(MINOR): $(GOBJ)
+#	$(CC) -shared -Wl,-soname,libgivy.so.$(MAJOR) -o $@ $(GOBJ) -lc
+
+#libglutivy.so.$(MAJOR).$(MINOR): $(GTKOBJ)
+#	$(CC) -shared -Wl,-soname,libglutivy.so.$(MAJOR) -o $@ \
+#	$(GLUTOBJ) $(GLUTLIB) -lX11 -lc
 
 clean:
 	-rm -f $(TARGETS) *.o *.a *.so *.so.* *~
 
-install: all
-	test -d $(PREFIX)/usr/bin || mkdirhier $(PREFIX)/usr/bin
+installlibs: static-libs shared-libs
 	test -d $(PREFIX)/usr/lib || mkdirhier $(PREFIX)/usr/lib
-	test -d $(PREFIX)/usr/include || mkdirhier $(PREFIX)/usr/include
-	install -m755 ivyprobe $(PREFIX)/usr/bin
 
+	test -d $(PREFIX)/usr/include || mkdirhier $(PREFIX)/usr/include
 	install -m644 libivy.a $(PREFIX)/usr/lib
+	install -m644 libgivy.a $(PREFIX)/usr/lib
+#	install -m644 libtclivy.a $(PREFIX)/usr/lib
 
 	install -m644 libivy.$(MAJOR).$(MINOR).dylib $(PREFIX)/usr/lib
-#	ln -s /usr/lib/ivytcl.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/ivytcl.so
+#	install -m644 libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib
+#	install -m644 libgivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib
+
+	install -m644 *.h $(PREFIX)/usr/include
+
+installliblinks: installlibs
 	ln -sfh /usr/lib/libivy.$(MAJOR).$(MINOR).dylib $(PREFIX)/usr/lib/libivy.dylib
 	ln -sfh /usr/lib/libivy.$(MAJOR).$(MINOR).dylib $(PREFIX)/usr/lib/libivy.$(MAJOR).dylib
+	#ln -s /usr/lib/libtclivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libtclivy.so
+	#ln -s /usr/lib/libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libivy.so
+	#ln -s /usr/lib/libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libivy.so.$(MAJOR)
+	ln -s /usr/lib/libgivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libgivy.so
+	#ln -s /usr/lib/libgivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libgivy.so.$(MAJOR)
+	
+
+installbins: commands
+	test -d $(PREFIX)/usr/bin || mkdirhier $(PREFIX)/usr/bin
 
-# we put -fh option to ln to unlink previous links the link to occur
-
-	install -m644 -c *.h $(PREFIX)/usr/include
-#	test -d $(PREFIX)/usr/local/doc/ivy-c || mkdir $(PREFIX)/usr/local/doc/ivy-c
-#	for f in `find  ../doc/*.html -type f `; do \#-maxdepth 1`; do \
-#               install -m 644 $$f $(PREFIX)/usr/local/doc/ivy-c; \
-#        done
-#	test -d $(PREFIX)/usr/local/man/man1 || mkdir $(PREFIX)/usr/local/man/man1
-#	for f in `find  ../doc/*.1 -type f `; do \#-maxdepth 1`; do \
-#                install -m 644 $$f $(PREFIX)/usr/local/man/man1; \
-#        done
+	install -m755 ivyprobe $(PREFIX)/usr/bin
+#	install -m755 ivyglutprobe $(PREFIX)/usr/X11R6/bin
+
+installdocs:
+	test -d $(PREFIX)/usr/doc/ivy-c || mkdirhier $(PREFIX)/usr/doc/ivy-c
+	for f in `find  ../doc/*.html -type f -maxdepth 1`; do \
+                install -m 644 $$f $(PREFIX)/usr/doc/ivy-c; \
+        done
+	test -d $(PREFIX)/usr/man/man1 || mkdirhier $(PREFIX)/usr/man/man1
+	for f in `find  ../doc/*.1 -type f -maxdepth 1`; do \
+                install -m 644 $$f $(PREFIX)/usr/man/man1; \
+        done
+
+install: installlibs installbins installliblinks installdocs
+
+rpm::
+	/usr/bin/rpmize