Changeset 323

Show
Ignore:
Timestamp:
07/15/09 16:05:12 (15 years ago)
Author:
trnewman
Message:

Added proper macros and cleaned up lib linking issues.

Location:
vtcross/trunk
Files:
6 added
15 modified

Legend:

Unmodified
Added
Removed

  • vtcross/trunk/Makefile.am

    r161 r323  
    11ACLOCAL_AMFLAGS = -I m4 
     2 
     3include $(top_srcdir)/Makefile.common 
    24 
    35SUBDIRS = src doc 
    46 
     7 

  • vtcross/trunk/reconf

    r161 r323  
    22 
    33libtoolize && \ 
    4 aclocal && \ 
     4aclocal -I config&& \ 
    55autoconf && \ 
    66autoheader && \ 

  • vtcross/trunk/src/Makefile.am

    r181 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
     3 
    14SUBDIRS = lib include policy_engines cognitive_engines service_management_layer \ 
    25                  libvtcross shell 

  • vtcross/trunk/src/cognitive_engines/Makefile.am

    r218 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13INCLUDES = -I$(top_srcdir)/src/include 
    24 
    … …  
    68 
    79cbr_demo_SOURCES = CognitiveEngine.cpp cbr_demo.cpp 
    8 cbr_demo_LDADD = -lsqlite3 ../lib/socketcomm/libsocketcomm.a 
     10cbr_demo_LDADD = -lsqlite3 $(CROSS_SOCKETCOMM_LA)  
    911 

  • vtcross/trunk/src/include/Makefile.am

    r161 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13SUBDIRS = vtcross tinyxml 

  • vtcross/trunk/src/include/tinyxml/Makefile.am

    r161 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
     3 
    14include_HEADERS = tinystr.h tinyxml.h 

  • vtcross/trunk/src/include/vtcross/Makefile.am

    r199 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13include_HEADERS = error.h debug.h socketcomm.h cbr.h components.h \ 
    24                                  containers.h libvtcross.h common.h config.h 

  • vtcross/trunk/src/lib/Makefile.am

    r161 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13SUBDIRS = socketcomm tinyxml 

  • vtcross/trunk/src/lib/socketcomm/Makefile.am

    r317 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13INCLUDES = -I$(top_srcdir)/src/include 
    24 

  • vtcross/trunk/src/lib/tinyxml/Makefile.am

    r161 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13INCLUDES = -I$(top_srcdir)/src/include/tinyxml 
    24 

  • vtcross/trunk/src/libvtcross/Makefile.am

    r299 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13INCLUDES = -I$(top_srcdir)/src/include 
    24 
    … …  
    68libvtcross_la_SOURCES = libvtcross.cpp 
    79libvtcross_la_LDFLAGS = -version-info 1:0:0 
    8 libvtcross_la_LIBADD = ../lib/socketcomm/libsocketcomm.a 
     10libvtcross_la_LIBADD = $(CROSS_SOCKETCOMM_LA)  
    911 
    1012libvtcross_demo_SOURCES = libvtcross_demo.cpp 
    11 libvtcross_demo_LDADD = libvtcross.la 
     13libvtcross_demo_LDADD = $(CROSS_LA)  
    1214 
    1315libvtcross_demo_sml_SOURCES = libvtcross_demo_sml.cpp 
    14 libvtcross_demo_sml_LDADD = libvtcross.la 
     16libvtcross_demo_sml_LDADD = $(CROSS_LA) 
    1517 

  • vtcross/trunk/src/libvtcross/swig/Makefile.am

    r299 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
     3 
    14BUILT_SOURCES = $(srcdir)/libvtcross_wrap.cpp 
    25SWIG_SOURCES = libvtcross.i 

  • vtcross/trunk/src/policy_engines/Makefile.am

    r161 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13INCLUDES = -I$(top_srcdir)/src/include 
    24 
    … …  
    68 
    79policy_demo_SOURCES = PolicyEngine.cpp policy_demo.cpp 
    8 policy_demo_LDADD = ../lib/socketcomm/libsocketcomm.a 
    9  
     10policy_demo_LDADD = $(CROSS_SOCKETCOMM_LA)  

  • vtcross/trunk/src/service_management_layer/Makefile.am

    r281 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13INCLUDES = -I$(top_srcdir)/src/include 
    24 
    … …  
    68 
    79sml_demo_SOURCES = ServiceManagementLayer.cpp sml_demo.cpp 
    8 sml_demo_LDADD = -ldl -lpthread -lsqlite3  ../lib/tinyxml/libtinyxml.a ../lib/socketcomm/libsocketcomm.a 
     10sml_demo_LDADD = -ldl -lpthread -lsqlite3  $(CROSS_XML_A) $(CROSS_SOCKETCOMM_LA)  

  • vtcross/trunk/src/shell/Makefile.am

    r207 r323  
     1include $(top_srcdir)/Makefile.common 
     2 
    13INCLUDES = -I$(top_srcdir)/src/include 
    24 
    … …  
    68 
    79shell_demo_SOURCES = CognitiveRadioShell.cpp shell_demo.cpp 
    8 shell_demo_LDADD = ../lib/tinyxml/libtinyxml.a ../lib/socketcomm/libsocketcomm.a 
    9  
     10shell_demo_LDADD = $(CROSS_XML_A) $(CROSS_SOCKETCOMM_LA)