From 827a03eb04457e9637d38419f47e4d5cd74b9395 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 19 Jan 2008 01:08:15 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/MacRes.r | 13 -------------
Fltk/Makefile | 24 ++++++++++++------------
Graphics/Makefile | 23 ++++++++++++-----------
contrib/NativeFileChooser/Makefile | 18 +++++++++---------
4 files changed, 33 insertions(+), 45 deletions(-)
delete mode 100644 Fltk/MacRes.r
diff --git a/Fltk/MacRes.r b/Fltk/MacRes.r
deleted file mode 100644
index 3d71f2ebbf..0000000000
--- a/Fltk/MacRes.r
+++ /dev/null
@@ -1,13 +0,0 @@
-data 'MBAR' (128) {
- $"0001 0080" /* ...� */
-};
-
-data 'MENU' (128, "Apple") {
- $"0080 0000 0000 0000 0000 FFFF FFFB 0114" /* .�........����.. */
- $"0A41 626F 7574 2046 4C54 4B00 0000 0001" /* �About FLTK..... */
- $"2D00 0000 0000" /* -..... */
-};
-
-data 'carb' (0) {
-};
-
diff --git a/Fltk/Makefile b/Fltk/Makefile
index de33c969f9..4e279c1ad6 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.156 2008-01-18 20:13:12 geuzaine Exp $
+# $Id: Makefile,v 1.157 2008-01-19 01:08:15 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -21,11 +21,12 @@
include ../variables
-LIB = ../lib/libGmshFltk.a
-INCLUDE = -I../Common -I../DataStr -I../Graphics -I../Geo -I../Mesh -I../Post\
- -I../Numeric -I../Parser -I../Fltk -I../Plugin -I../utils/solvers\
- -I../contrib/ANN/include -I../contrib/NativeFileChooser
-CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
+LIB = ../lib/libGmshFltk${LIBEXT}
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Graphics\
+ ${DASH}I../Geo ${DASH}I../Mesh ${DASH}I../Post ${DASH}I../Numeric\
+ ${DASH}I../Parser ${DASH}I../Fltk ${DASH}I../Plugin ${DASH}I../utils/solvers\
+ ${DASH}I../contrib/ANN/include ${DASH}I../contrib/NativeFileChooser
+CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = Main.cpp \
Message.cpp \
@@ -39,23 +40,22 @@ SRC = Main.cpp \
Colorbar_Window.cpp\
Solvers.cpp
+OBJ = ${SRC:.cpp=${OBJEXT}}
-OBJ = ${SRC:.cpp=.o}
-
-.SUFFIXES: .o .cpp
+.SUFFIXES: ${OBJEXT} .cpp
${LIB}: ${OBJ}
- ${AR} ${LIB} ${OBJ}
+ ${AR} ${ARFLAGS}${LIB} ${OBJ}
${RANLIB} ${LIB}
.cpp.o:
- ${CXX} ${CFLAGS} -c $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
res:
windres Win32Icon.rc -O coff Win32Icon.res
clean:
- rm -f *.o
+ rm -f *${OBJEXT}
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 3e41c23e6b..3784ad1174 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.130 2007-09-22 20:35:18 geuzaine Exp $
+# $Id: Makefile,v 1.131 2008-01-19 01:08:15 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -21,11 +21,12 @@
include ../variables
-LIB = ../lib/libGmshGraphics.a
-INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Post\
- -I../Graphics -I../Fltk -I../Numeric -I../Parser -I../Plugin\
- -I../contrib/MathEval -I../contrib/ANN/include
-CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
+LIB = ../lib/libGmshGraphics${LIBEXT}
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
+ ${DASH}I../Post ${DASH}I../Graphics ${DASH}I../Fltk ${DASH}I../Numeric\
+ ${DASH}I../Parser ${DASH}I../Plugin ${DASH}I../contrib/MathEval\
+ ${DASH}I../contrib/ANN/include
+CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = Draw.cpp \
Mesh.cpp \
@@ -44,19 +45,19 @@ SRC = Draw.cpp \
gl2ppm.cpp\
gl2yuv.cpp
-OBJ = ${SRC:.cpp=.o}
+OBJ = ${SRC:.cpp=${OBJEXT}}
-.SUFFIXES: .o .cpp
+.SUFFIXES: ${OBJEXT} .cpp
${LIB}: ${OBJ}
- ${AR} ${LIB} ${OBJ}
+ ${AR} ${ARFLAGS}${LIB} ${OBJ}
${RANLIB} ${LIB}
.cpp.o:
- ${CXX} ${CFLAGS} -c $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
- rm -f *.o
+ rm -f *${OBJEXT}
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/NativeFileChooser/Makefile b/contrib/NativeFileChooser/Makefile
index 4ba070e5b0..5159650678 100644
--- a/contrib/NativeFileChooser/Makefile
+++ b/contrib/NativeFileChooser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2008-01-18 20:13:13 geuzaine Exp $
+# $Id: Makefile,v 1.3 2008-01-19 01:08:15 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -21,24 +21,24 @@
include ../../variables
-LIB = ../../lib/libGmshNativeFileChooser.a
-INCLUDE = -I.
-CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} -DFLTK1
+LIB = ../../lib/libGmshNativeFileChooser${LIBEXT}
+INCLUDE = ${DASH}I.
+CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}DFLTK1
SRC = Fl_Native_File_Chooser.cxx
-OBJ = ${SRC:.cxx=.o}
+OBJ = ${SRC:.cxx=${OBJEXT}}
-.SUFFIXES: .o .cxx
+.SUFFIXES: ${OBJEXT} .cxx
${LIB}: ${OBJ}
- ${AR} ${LIB} ${OBJ}
+ ${AR} ${ARFLAGS}${LIB} ${OBJ}
${RANLIB} ${LIB}
.cxx.o:
- ${CXX} ${CFLAGS} -c $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
- rm -f *.o
+ rm -f *${OBJEXT}
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
--
GitLab