Changeset 5824:dc8445dc0451 in roaraudio

Timestamp:

01/06/13 13:39:55 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

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

Files:

• configure (modified) (1 diff)
• roarclients/Makefile (modified) (1 diff)
• roarclients/roar-config.c (modified) (4 diffs)

configure

@@ -522 +522 @@
  echo "#define ROAR_VERSION_STRING \"$VERSION\""
  grep -E '^COMMON_V_(MAJOR|MINOR|REV) *= [0-9]*$' Makefile.inc | sed 's/^COMMON_V_/#define ROAR_VERSION_/; s/=//'
+ echo '#define ROAR_VERSION_COMMON_REAL0(a,b,c) (#a "." #b "." #c)'
+ echo '#define ROAR_VERSION_COMMON_REAL1(a,b,c) ROAR_VERSION_COMMON_REAL0(a,b,c)'
+ echo '#define ROAR_VERSION_COMMON ROAR_VERSION_COMMON_REAL1(ROAR_VERSION_MAJOR, ROAR_VERSION_MINOR, ROAR_VERSION_REV)'
  echo "#define ROAR_BUILD_STAMP    \"$BUILD_STAMP\""
  echo

roarclients/Makefile

@@ -24 +24 @@
 
 #DEFINES        = -DDEBUG
-DEFINES    = -DCOMMON_VERSION=\"'$(COMMON_VERSION)'\" -DPREFIX=\"'$(PREFIX)'\" -DPREFIX_LIB=\"'$(PREFIX_LIB)'\" -DPREFIX_INC=\"'$(PREFIX_INC)'\"
 INCLUDE    = -I../include -I./include
 CFLAGS    += -g -Wall $(Wextra) $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH)

roarclients/roar-config.c

@@ -62 +62 @@
 
  if ( !strcasecmp(version, "current") )
-  version = COMMON_VERSION;
+  version = ROAR_VERSION_COMMON;
 
  ret.major    = strtoll(version, &next, 0);
@@ -197 +197 @@
  for (i = 1; i < argc; i++) {
   if ( !strcmp(argv[i], "--version") ) {
-   printf("%s\n", COMMON_VERSION);
+   printf("%s\n", ROAR_VERSION_COMMON);
   } else if ( !strcmp(argv[i], "--help") || !strcmp(argv[i], "-h") ) {
    usage();
@@ -257 +257 @@
    break;
   case PC:
-    printf(
-           "prefix=%s\n"
-           "exec_prefix=${prefix}\n"
-           "libdir=%s\n"
-           "includedir=%s\n",
-           PREFIX, PREFIX_LIB, PREFIX_INC
-          );
+    printf("prefix=");
+    print_path("prefix", 0, NULL, NULL);
+    printf("exec_prefix=${prefix}\n");
+    printf("libdir=");
+    print_path("prefix-lib", 0, NULL, NULL);
+    printf("includedir=");
+    print_path("prefix-inc", 0, NULL, NULL);
     printf("\n");
     printf(
@@ -275 +275 @@
            flags_ptr->name,
            flags_ptr->name,
-           COMMON_VERSION,
+           ROAR_VERSION_COMMON,
            flags_ptr->libs,
            flags_ptr->cflags