[med-svn] r15147 - trunk/packages/ctn/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-11-07 21:44:02 +0000 (Thu, 07 Nov 2013)
New Revision: 15147

Modified:
   trunk/packages/ctn/trunk/debian/ctnmake.debian.mysql.options
Log:
Finally get all options properly into build process


Modified: trunk/packages/ctn/trunk/debian/ctnmake.debian.mysql.options
===================================================================
--- trunk/packages/ctn/trunk/debian/ctnmake.debian.mysql.options	2013-11-07 21:35:55 UTC (rev 15146)
+++ trunk/packages/ctn/trunk/debian/ctnmake.debian.mysql.options	2013-11-07 21:44:02 UTC (rev 15147)
@@ -7,7 +7,7 @@
 LIBPATH_MOTIF = -L/usr/lib
 LIBPATH_UCB =
 LIBPATH_DATABASE =-L$(MYSQL_LIB)
-LIBS_X11 = -lXext -lXt -lX11
+LIBS_X11 := $(LDFLAGS) -lXext -lXt -lX11
 LIBS_MOTIF = -lXm
 LIBS_XAW = -lXaw -lXmu -lXt -lXext -lm
 LIBS_OS = -lz
@@ -23,9 +23,9 @@
 CFLAGS_MOTIF = -I$(XM_INCLUDE)
 
 #DEBUG_LIBS = -lmalloc
-C_OPTS = -g -DDEBUG -D$(ARCHITECTURE) -D$(OS) -DSHARED_MEMORY \
+C_OPTS := -g -DDEBUG -D$(ARCHITECTURE) -D$(OS) -DSHARED_MEMORY \
 -DSEMAPHORE -DX11 -DATHENA -DX11R4 -DUSLEEP -DMYSQLDB \
 -I$(DICOM_INCLUDE) -I$(MYSQL_INCLUDE) \
-$(CFLAGS_MOTIF) $(CFLAGS_X11) \
+$(CFLAGS_MOTIF) $(CFLAGS_X11) $(CFLAGS) \
 -DLONGSIZE=$(LONGSIZE) -DINTSIZE=$(INTSIZE) -DSHORTSIZE=$(SHORTSIZE) \
 -DTIMEOFDAYARGS=2 -DMOTIF -DUSEREGCOMP