Changeset 2118 for trunk/gui/src

Timestamp:

Mar 3, 2011 1:19:28 PM (13 years ago)

Author:

gah

Message:

Fixes for RapptureGUI build Makefile

File:

• trunk/gui/src/Makefile.in (modified) (5 diffs)

trunk/gui/src/Makefile.in

@@ -1 +1 @@
 
 bindir          = @bindir@
-datadir         = @datadir@
-datarootdir     = @datarootdir@
+datadir         = @datadir@
+datarootdir     = @datarootdir@
 exec_prefix     = @exec_prefix@
 includedir      = @includedir@
@@ -8 +8 @@
 mandir          = @mandir@
 prefix          = @prefix@
-srcdir          = @srcdir@
+srcdir          = @srcdir@
 
-SHELL           = @SHELL@
-INSTALL         = @INSTALL@
-MKDIR_P         = @MKDIR_P@
+SHELL           = @SHELL@
+INSTALL         = @INSTALL@
+MKDIR_P         = @MKDIR_P@
 
+CXX             = @CXX@
 CC              = @CC@
 CFLAGS_DEBUG    = @CFLAGS_DEBUG@ -Wall
@@ -24 +25 @@
 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
-CFLAGS          = @CFLAGS@
+CFLAGS          = @CFLAGS@ -fPIC
+TCL_VERSION     = @TCL_VERSION@
+TCL_LIB_SPEC    = @TCL_LIB_SPEC@
 
-CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
+CC_SWITCHES     = $(SHLIB_CFLAGS) $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
+CXX_SWITCHES    = $(SHLIB_CFLAGS) $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
 
 INCLUDES        = -I$(srcdir) \
@@ -41 +45 @@
 
 LIBS            = \
-                -lrappture \
+                -L../../src/core -lrappture \
                 -L$(libdir) -ltcl8.4 -ltk8.4 -lm
 
@@ -64 +68 @@
         $(INSTALL) -m 555 $(lib) $(destdir) 
 
+.cc.o:
+        $(CXX) $(CXX_SWITCHES) -c $?
 .c.o:
         $(CC) $(CC_SWITCHES)-c $?