Changeset 5824:dc8445dc0451 in roaraudio


Ignore:
Timestamp:
01/06/13 13:39:55 (8 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

make correct use of API, reduced number of useless -DXXX arguments

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • configure

    r5810 r5824  
    522522 echo "#define ROAR_VERSION_STRING \"$VERSION\"" 
    523523 grep -E '^COMMON_V_(MAJOR|MINOR|REV) *= [0-9]*$' Makefile.inc | sed 's/^COMMON_V_/#define ROAR_VERSION_/; s/=//' 
     524 echo '#define ROAR_VERSION_COMMON_REAL0(a,b,c) (#a "." #b "." #c)' 
     525 echo '#define ROAR_VERSION_COMMON_REAL1(a,b,c) ROAR_VERSION_COMMON_REAL0(a,b,c)' 
     526 echo '#define ROAR_VERSION_COMMON ROAR_VERSION_COMMON_REAL1(ROAR_VERSION_MAJOR, ROAR_VERSION_MINOR, ROAR_VERSION_REV)' 
    524527 echo "#define ROAR_BUILD_STAMP    \"$BUILD_STAMP\"" 
    525528 echo 
  • roarclients/Makefile

    r5750 r5824  
    2424 
    2525#DEFINES        = -DDEBUG 
    26 DEFINES    = -DCOMMON_VERSION=\"'$(COMMON_VERSION)'\" -DPREFIX=\"'$(PREFIX)'\" -DPREFIX_LIB=\"'$(PREFIX_LIB)'\" -DPREFIX_INC=\"'$(PREFIX_INC)'\" 
    2726INCLUDE    = -I../include -I./include 
    2827CFLAGS    += -g -Wall $(Wextra) $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) 
  • roarclients/roar-config.c

    r5823 r5824  
    6262 
    6363 if ( !strcasecmp(version, "current") ) 
    64   version = COMMON_VERSION; 
     64  version = ROAR_VERSION_COMMON; 
    6565 
    6666 ret.major    = strtoll(version, &next, 0); 
     
    197197 for (i = 1; i < argc; i++) { 
    198198  if ( !strcmp(argv[i], "--version") ) { 
    199    printf("%s\n", COMMON_VERSION); 
     199   printf("%s\n", ROAR_VERSION_COMMON); 
    200200  } else if ( !strcmp(argv[i], "--help") || !strcmp(argv[i], "-h") ) { 
    201201   usage(); 
     
    257257   break; 
    258258  case PC: 
    259     printf( 
    260            "prefix=%s\n" 
    261            "exec_prefix=${prefix}\n" 
    262            "libdir=%s\n" 
    263            "includedir=%s\n", 
    264            PREFIX, PREFIX_LIB, PREFIX_INC 
    265           ); 
     259    printf("prefix="); 
     260    print_path("prefix", 0, NULL, NULL); 
     261    printf("exec_prefix=${prefix}\n"); 
     262    printf("libdir="); 
     263    print_path("prefix-lib", 0, NULL, NULL); 
     264    printf("includedir="); 
     265    print_path("prefix-inc", 0, NULL, NULL); 
    266266    printf("\n"); 
    267267    printf( 
     
    275275           flags_ptr->name, 
    276276           flags_ptr->name, 
    277            COMMON_VERSION, 
     277           ROAR_VERSION_COMMON, 
    278278           flags_ptr->libs, 
    279279           flags_ptr->cflags 
Note: See TracChangeset for help on using the changeset viewer.