[calculix-cgx] 02/06: Debian Build Patch to build with freeglut and libsnl from debian

[Wolfgang Fütterer]

This is an automated email from the git hooks/post-receive script.

wlfuetter-guest pushed a commit to branch patch-queue/master
in repository calculix-cgx.

commit f4eb7fd12018ad58233355eaeca667737474b2a0
Author: Wolfgang Fütterer <debian at wlf-online.de>
Date:   Wed Jan 20 14:46:21 2016 +0100

    Debian Build Patch
    to build with freeglut and libsnl from debian
---
 cgx_2.10/src/Makefile | 54 +++++----------------------------------------------
 1 file changed, 5 insertions(+), 49 deletions(-)

diff --git a/cgx_2.10/src/Makefile b/cgx_2.10/src/Makefile
index 78055f5..1b785e6 100644
--- a/cgx_2.10/src/Makefile
+++ b/cgx_2.10/src/Makefile
@@ -1,20 +1,12 @@
-CFLAGS = -O3 -Wall \
+CFLAGS += -O3 -Wall \
   -I./ \
   -I/usr/include \
   -I/usr/include/GL \
-  -I../../libSNL/src \
-  -I../../glut-3.5/src \
-  -I/usr/X11/include 
 
-LFLAGS = \
-  -L/usr/lib64 -lGL -lGLU \
-  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
-  -lm -lpthread -lrt
-
-
-# on 32bit systems change lib64 to lib
-# -lpthread is needed if mesaGL is using threading, otherwhise it is not needed
-# -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
+LFLAGS += \
+  -L/usr/lib64 -lGL -lGLU -lglut -lSNL\
+  -L/usr/X11R6/lib -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
+  -lm -lpthread
 
 include Makefile.inc
 
@@ -22,44 +14,8 @@ ULIB = \
  userFunction.c
 
 SUTIL = \
- ../../glut-3.5/src/layerutil.c \
- ../../glut-3.5/src/glut_dials.c \
- ../../glut-3.5/src/glut_ext.c \
- ../../glut-3.5/src/glut_mesa.c \
- ../../glut-3.5/src/glut_menu.c \
- ../../glut-3.5/src/glut_modifier.c \
- ../../glut-3.5/src/glut_space.c \
- ../../glut-3.5/src/glut_shapes.c \
- ../../glut-3.5/src/glut_tablet.c \
- ../../glut-3.5/src/glut_warp.c \
- ../../glut-3.5/src/glut_8x13.c \
- ../../glut-3.5/src/glut_9x15.c \
- ../../glut-3.5/src/glut_hel10.c \
- ../../glut-3.5/src/glut_hel18.c \
- ../../glut-3.5/src/glut_hel12.c \
- ../../glut-3.5/src/glut_tr10.c \
- ../../glut-3.5/src/glut_tr24.c \
- ../../glut-3.5/src/glut_bitmap.c \
- ../../glut-3.5/src/glut_cursor.c \
- ../../glut-3.5/src/glut_event.c \
- ../../glut-3.5/src/glut_get.c \
- ../../glut-3.5/src/glut_overlay.c \
- ../../glut-3.5/src/glut_input.c \
- ../../glut-3.5/src/glut_stroke.c \
- ../../glut-3.5/src/glut_teapot.c \
- ../../glut-3.5/src/glut_winmisc.c \
- ../../glut-3.5/src/glut_fullscrn.c \
- ../../glut-3.5/src/glut_cindex.c \
- ../../glut-3.5/src/glut_roman.c \
- ../../glut-3.5/src/glut_mroman.c \
- ../../glut-3.5/src/glut_swidth.c \
- ../../glut-3.5/src/glut_bwidth.c \
- ../../glut-3.5/src/glut_win.c \
- ../../glut-3.5/src/glut_init.c \
- ../../glut-3.5/src/glut_util.c \
  uselibSNL.cpp \
  generateTet.cpp \
- ../../libSNL/src/*.cpp
 
 OLIB = $(SLIB:.c=.o)
 OULIB = $(ULIB:.c=.o)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/calculix-cgx.git