Changeset 5825:3e41991f9a62 in roaraudio


Ignore:
Timestamp:
01/06/13 14:12:21 (7 years ago)
Author:
phi
Branch:
default
Message:

removed yet another set of -DXXX as well as $(PKGDEFINES). Updated configure to write some more stuff into config.h

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile.inc

    r5807 r5825  
    66COMMON_VERSION  = $(COMMON_V_MM).$(COMMON_V_REV) 
    77COMMON_SOVERSION= 2 
    8  
    9 PKGDEFINES      = -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\"" -DDISTRIBUTION_VERSION_STRING="\"$(DISTRIBUTION_VERSION_STRING)\"" 
    108 
    119# libroar: 
  • configure

    r5824 r5825  
    525525 echo '#define ROAR_VERSION_COMMON_REAL1(a,b,c) ROAR_VERSION_COMMON_REAL0(a,b,c)' 
    526526 echo '#define ROAR_VERSION_COMMON ROAR_VERSION_COMMON_REAL1(ROAR_VERSION_MAJOR, ROAR_VERSION_MINOR, ROAR_VERSION_REV)' 
     527 echo "#define ROAR_VERSION_DISTRIBUTION_STRING \"$DISTRIBUTION_VERSION_STRING\"" 
    527528 echo "#define ROAR_BUILD_STAMP    \"$BUILD_STAMP\"" 
     529 echo 
     530 echo "#define ROAR_DEV_VENDOR        $DEV_VENDOR" 
     531 echo "#define ROAR_DEV_VENDOR_NAME   \"$DEV_VENDOR_NAME\"" 
     532 echo "#define ROAR_DEV_VENDOR_STRING \"$DEV_VENDOR/$DEV_VENDOR_NAME\"" 
    528533 echo 
    529534 [ "$DEFAULT_RATE"        = '' ] || echo "#define ROAR_RATE_DEFAULT     $DEFAULT_RATE" 
  • libroar/Makefile

    r5692 r5825  
    1616#DEFINES+= -D_LIBROAR_NOATTR_WARNINGS 
    1717INCLUDE = -I../include -I../include/libroar 
    18 CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC) 
     18CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC) 
    1919LDFLAGS+= -g -Wall $(SHARED) $(LDPATH) 
    2020LIBS    = $(LIBROAR_NS) 
  • libroar/serverinfo.c

    r5823 r5825  
    116116#endif 
    117117 
    118  if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) { 
    119   ret->version = "libroar/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">"; 
     118 if ( ROAR_VERSION_DISTRIBUTION_STRING[0] == 0 ) { 
     119  ret->version = "libroar/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING ">"; 
    120120 } else { 
    121   ret->version = "libroar/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING "> (" DISTRIBUTION_VERSION_STRING ")"; 
     121  ret->version = "libroar/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING "> (" ROAR_VERSION_DISTRIBUTION_STRING ")"; 
    122122 } 
    123123#ifdef ROAR_HAVE_GETHOSTID 
  • roard/Makefile

    r5744 r5825  
    1717#DEFINES        = -DMONITOR_LATENCY 
    1818INCLUDE   = -I../include -I./include 
    19 CFLAGS   += -g -Wall $(OPTI_O) $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH) 
     19CFLAGS   += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) 
    2020LDFLAGS  += -g -Wall $(rdynamic) -L../lib/ $(LDPATH) 
    2121DRVLIBS   = $(lib_esd) $(lib_ossaudio) $(lib_ao) $(lib_shout) $(pthread) $(lib_sndio) $(lib_rsound) $(lib_portaudio) $(lib_pablio) $(lib_asound) $(lib_winmm) $(lib_pulse_simple) $(lib_pulse) $(lib_jack) $(lib_artsc) 
  • roard/req.c

    r5823 r5825  
    790790 
    791791   // the following if is optimized out by compiler. 
    792    if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) { 
    793     info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">"; 
     792   if ( ROAR_VERSION_DISTRIBUTION_STRING[0] == 0 ) { 
     793    info.version = "roard/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING ">"; 
    794794   } else { 
    795     info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING "> (" DISTRIBUTION_VERSION_STRING ")"; 
     795    info.version = "roard/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING "> (" ROAR_VERSION_DISTRIBUTION_STRING ")"; 
    796796   } 
    797797 
Note: See TracChangeset for help on using the changeset viewer.