Changeset 491 for trunk/matml

Timestamp:

11/26/2009 04:02:08 PM (2 years ago)

Author:

powell

Message:

New Ternary libglade-based GUI!

Location:

trunk/matml/src/ternary

Files:

• ChangeLog (modified) (1 diff)
• configure.in (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Ternary.c (added)
• Ternary.glade (added)

trunk/matml/src/ternary/ChangeLog

@@ -4 +4 @@
   * Fixed and considerably improved spinodal caculation.
   * New adjust_gaussians function to aid in setting Gaussian parameters.
+  * New Ternary GUI using a Glade interface, not yet complete.
 
  --

trunk/matml/src/ternary/configure.in

@@ -30 +30 @@
 MATH_BLASLAPACK_CHECKS
 
+dnl Glade GUI library and libgnomeui checks
+PKG_CHECK_MODULES(GNOMEUI, libglade-2.0 libgnomeui-2.0)
+AM_CONDITIONAL(GNOMEUI_EXISTS, test x$gnomeui_exists != xno)
+
 dnl Documentation tools
 CXREF_LATEX_CHECKS

trunk/matml/src/ternary/Makefile.am

@@ -18 +18 @@
 libgibbs_la_SOURCES = geomview.c qhull.c book.c spinodal.c
 libgibbs_la_LIBADD  = -lqhull libfreenergy.la
-libgibbs_la_CFLAGS  = -std=c99 -DGEOMVIEW=\"@GEOMVIEW@\" -DDEBUG
+libgibbs_la_CFLAGS  = -std=c99 -DGEOMVIEW=\"@GEOMVIEW@\" #-DDEBUG
 libgibbs_la_LDFLAGS = -version-info 0:0:0
 
 include_HEADERS = freenergy.h gibbs.h
 
-bin_PROGRAMS    = ternary square
+if GNOMEUI_EXISTS
+GNOMEUI_PROGS = Ternary
+else
+GNOMEUI_PROGS =
+endif
+
+bin_PROGRAMS    = ternary square $(GNOMEUI_PROGS)
 ternary_SOURCES = ternary.c
 ternary_CFLAGS  = #-DDEBUG
 ternary_LDADD   = libgibbs.la libfreenergy.la
+
 square_SOURCES = square.c
 square_CFLAGS  = #-DDEBUG
 square_LDADD   = libgibbs.la libfreenergy.la
+
+Ternary_SOURCES = Ternary.c
+Ternary_CFLAGS  = $(GNOMEUI_CFLAGS) -DVERSION="\"@VERSION@\""\ #-DDEBUG
+Ternary_LDADD   = libgibbs.la libfreenergy.la $(GNOMEUI_LIBS)
+Ternary_LDFLAGS = -rdynamic
 
 EXTRA_DIST = autogen.sh macros/autogen.sh macros/cxref-latex.m4 \