[xiph-commits] r18343 - trunk/spectrum

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2012-05-31 15:25:04 -0700 (Thu, 31 May 2012)
New Revision: 18343

Modified:
   trunk/spectrum/Makefile
   trunk/spectrum/spec_panel.c
   trunk/spectrum/wave_panel.c
Log:
Makefile define fixup



Modified: trunk/spectrum/Makefile
===================================================================
--- trunk/spectrum/Makefile	2012-05-31 18:54:57 UTC (rev 18342)
+++ trunk/spectrum/Makefile	2012-05-31 22:25:04 UTC (rev 18343)
@@ -17,7 +17,7 @@
 # ADD_DEF=
 
 
-CC=gcc 
+CC=gcc
 LD=gcc
 INSTALL=install
 PREFIX=/usr/local
@@ -30,18 +30,18 @@
 WAVEFORM_OBJ = waveform.o wave_process.o wave_panel.o wave_plot.o io.o
 OBJ = $(SPECTRUM_OBJ) $(WAVEFORM_OBJ)
 
-GCF = -DETCDIR=\\\"$(ETCDIR)\\\" `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_SINGLE_INCLUDES
+GCF = `pkg-config --cflags gtk+-2.0` -DETCDIR=$(ETCDIR) -DGTK_DISABLE_SINGLE_INCLUDES
 
 CFLAGS := ${CFLAGS} $(GCF) $(ADD_DEF)
 
-all:	
+all:
 	$(MAKE) target CFLAGS="${CFLAGS} -O3 -ffast-math -fomit-frame-pointer"
 
 debug:
 	$(MAKE) target CFLAGS="${CFLAGS} -g -Wall -W -Wno-unused-parameter -D__NO_MATH_INLINES"
 
 profile:
-	$(MAKE) target CFLAGS="${CFLAGS} -pg -g -O3 -ffast-math" LIBS="-lgprof-helper "
+	$(MAKE) target CFLAGS="${CFLAGS} -pg -g -O3 -ffast-math"
 
 clean:
 	rm -f $(OBJ) *.d *.d.* gmon.out spectrum

Modified: trunk/spectrum/spec_panel.c
===================================================================
--- trunk/spectrum/spec_panel.c	2012-05-31 18:54:57 UTC (rev 18342)
+++ trunk/spectrum/spec_panel.c	2012-05-31 22:25:04 UTC (rev 18343)
@@ -875,12 +875,14 @@
   return 1;
 }
 
+#define STR(X) #X
+
 void panel_go(int argc,char *argv[]){
   char *homedir=getenv("HOME");
   int found=0;
   memset(&p,0,sizeof(p));
 
-  found|=look_for_gtkrc(ETCDIR"/spectrum-gtkrc");
+  found|=look_for_gtkrc(STR(ETCDIR) "/spectrum-gtkrc");
   {
     char *rcdir=getenv("HOME");
     if(rcdir){
@@ -911,14 +913,14 @@
 	    "\t./spectrum-gtkrc\n"
 	    "\t$(SPECTRUM_RCDIR)/spectrum-gtkrc\n"
 	    "\t~/.spectrum/spectrum-gtkrc\n\t"
-	    ETCDIR"/spectrum-gtkrc\n"
+	    STR(ETCDIR) "/spectrum-gtkrc\n"
 	    "This configuration file is used to tune the color, font and other detail aspects\n"
 	    "of the user interface.  Although the analyzer will work without it, the UI\n"
 	    "appearence will likely make the application harder to use due to missing visual\n"
 	    "cues.\n");
   }
 
-  gtk_rc_add_default_file(ETCDIR"/spectrum-gtkrc");
+  gtk_rc_add_default_file(STR(ETCDIR) "/spectrum-gtkrc");
   if(homedir){
     char *rcfile="/.spectrum-gtkrc";
     char *homerc=calloc(1,strlen(homedir)+strlen(rcfile)+1);

Modified: trunk/spectrum/wave_panel.c
===================================================================
--- trunk/spectrum/wave_panel.c	2012-05-31 18:54:57 UTC (rev 18342)
+++ trunk/spectrum/wave_panel.c	2012-05-31 22:25:04 UTC (rev 18343)
@@ -805,12 +805,14 @@
   return 1;
 }
 
+#define STR(X) #X
+
 void panel_go(int argc,char *argv[]){
   char *homedir=getenv("HOME");
   int found=0;
   memset(&p,0,sizeof(p));
 
-  found|=look_for_gtkrc(ETCDIR"/waveform-gtkrc");
+  found|=look_for_gtkrc(STR(ETCDIR)"/waveform-gtkrc");
   {
     char *rcdir=getenv("HOME");
     if(rcdir){
@@ -841,14 +843,14 @@
 	    "\t./waveform-gtkrc\n"
 	    "\t$(SPECTRUM_RCDIR)/waveform-gtkrc\n"
 	    "\t~/.spectrum/waveform-gtkrc\n\t"
-	    ETCDIR"/wavegform-gtkrc\n"
+	    STR(ETCDIR)"/wavegform-gtkrc\n"
 	    "This configuration file is used to tune the color, font and other detail aspects\n"
 	    "of the user interface.  Although the viewer will work without it, the UI\n"
 	    "appearence will likely make the application harder to use due to missing visual\n"
 	    "cues.\n");
   }
 
-  gtk_rc_add_default_file(ETCDIR"/waveform-gtkrc");
+  gtk_rc_add_default_file(STR(ETCDIR)"/waveform-gtkrc");
   if(homedir){
     char *rcfile="/.waveform-gtkrc";
     char *homerc=calloc(1,strlen(homedir)+strlen(rcfile)+1);