Changeset 2461


Ignore:
Timestamp:
Feb 19, 2009, 1:39:14 PM (16 years ago)
Author:
Christoph Mayer
Message:

-bei mcpo und ariba make install sauber gelöst mit nobase_ statt mit post-install hacks. so wie bei der xercesc build umgebung und im automake manual bei alternatives beschrieben

File:
1 edited

Legend:

Unmodified
Added
Removed

  • source/ariba/Makefile.am

    r2460 r2461  
     1# the rocking Ariba library
     2
    13lib_LTLIBRARIES     = libariba.la
    2 libariba_la_SOURCES =
     4
     5# source files and header files
     6# header files get installed using
     7# make install. the nobase_ prefix
     8# keeps the directory structure
     9
     10libariba_la_SOURCES        =
     11nobase_libariba_la_HEADERS =
    312
    413# compiler flags ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    … …  
    4352# sources and subdirs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    4453
    45 #tidy interface
     54# where to put the libs into -> /ariba
     55# currently we have no version number
     56# attached to the header/libs folder
     57libariba_ladir = ${pkgincludedir}
     58
     59# ------------> tidy interface
     60
    4661libariba_la_SOURCES += \
    4762  AribaModule.cpp \
     63  CommunicationListener.cpp \
     64  Identifiers.cpp \
     65  LinkProperties.cpp \
     66  DataMessage.cpp \
     67  Module.cpp \
     68  Name.cpp \
     69  Node.cpp \
     70  NodeListener.cpp \
     71  SpoVNetProperties.cpp
     72
     73nobase_libariba_la_HEADERS += \
     74  ariba.h \
    4875  AribaModule.h \
    49   CommunicationListener.cpp \
    5076  CommunicationListener.h \
    51   Identifiers.cpp \
    5277  Identifiers.h \
    53   LinkProperties.cpp \
    5478  LinkProperties.h \
    5579  Message.h \
    56   DataMessage.cpp \
    5780  DataMessage.h \
    58   Module.cpp \
    5981  Module.h \
    60   Name.cpp \
    6182  Name.h \
    62   Node.cpp \
    6383  Node.h \
    64   NodeListener.cpp \
    6584  NodeListener.h \
    66   SpoVNetProperties.cpp \
    6785  SpoVNetProperties.h
    6886
    69 #communication
     87# ------------> communication
     88
    7089libariba_la_SOURCES += \
    7190  communication/BaseCommunication.cpp \
     91  communication/CommunicationEvents.cpp \
     92  communication/EndpointDescriptor.cpp
     93
     94nobase_libariba_la_HEADERS += \
    7295  communication/BaseCommunication.h \
    73   communication/CommunicationEvents.cpp \
    7496  communication/CommunicationEvents.h \
    75   communication/EndpointDescriptor.cpp \
    7697  communication/EndpointDescriptor.h
    7798
    78 #communication :: messages
    79 libariba_la_SOURCES += \
    80   communication/messages/AribaBaseMsg.cpp \
     99# ------------> communication :: messages
     100
     101libariba_la_SOURCES += \
     102  communication/messages/AribaBaseMsg.cpp
     103
     104nobase_libariba_la_HEADERS += \
    81105  communication/messages/AribaBaseMsg.h
    82106
    83 #communication :: modules
    84 libariba_la_SOURCES += \
     107# ------------> communication :: modules
     108
     109nobase_libariba_la_HEADERS += \
    85110  communication/modules/modules.h \
    86111  communication/modules/_namespace.h
    87112
    88 #communication :: modules :: network
     113# ------------> communication :: modules :: network
    89114libariba_la_SOURCES += \
    90115  communication/modules/network/NetworkLocator.cpp \
     116  communication/modules/network/NetworkProtocol.cpp
     117
     118nobase_libariba_la_HEADERS += \
    91119  communication/modules/network/NetworkLocator.h \
    92   communication/modules/network/NetworkProtocol.cpp \
    93120  communication/modules/network/NetworkProtocol.h
    94121
    95 #communication :: modules :: network :: ip
     122# ------------> communication :: modules :: network :: ip
     123
    96124libariba_la_SOURCES += \
    97125  communication/modules/network/ip/IPv4Locator.cpp \
     126  communication/modules/network/ip/IPv4NetworkProtocol.cpp
     127
     128nobase_libariba_la_HEADERS += \
    98129  communication/modules/network/ip/IPv4Locator.h  \
    99   communication/modules/network/ip/IPv4NetworkProtocol.cpp \
    100130  communication/modules/network/ip/IPv4NetworkProtocol.h
    101131
    102 if OMNET
    103 #communication :: modules :: network :: omnet
    104 libariba_la_SOURCES += \
    105   communication/modules/network/omnet/OmnetNetworkProtocol.cpp \
     132# ------------> communication :: modules :: network :: omnet
     133
     134if OMNET
     135libariba_la_SOURCES += \
     136  communication/modules/network/omnet/OmnetNetworkProtocol.cpp
     137
     138nobase_libariba_la_HEADERS += \
    106139  communication/modules/network/omnet/OmnetNetworkProtocol.h
    107140endif
    108141
    109 #communication :: modules :: transport
     142#------------> communication :: modules :: transport
     143
    110144libariba_la_SOURCES += \
    111145  communication/modules/transport/TransportLocator.cpp \
     146  communication/modules/transport/TransportProtocol.cpp
     147
     148nobase_libariba_la_HEADERS += \
    112149  communication/modules/transport/TransportLocator.h \
    113   communication/modules/transport/TransportProtocol.cpp \
    114150  communication/modules/transport/TransportProtocol.h
    115151
    116 if OMNET
    117 #communication :: modules :: transport :: omnet
     152#------------> communication :: modules :: transport :: omnet
     153
     154if OMNET
    118155libariba_la_SOURCES += \
    119156  communication/modules/transport/omnet/AribaOmnetMessage_m.cc \
     157  communication/modules/transport/omnet/AribaOmnetModule.cpp
     158
     159nobase_libariba_la_HEADERS += \
    120160  communication/modules/transport/omnet/AribaOmnetMessage_m.h \
    121   communication/modules/transport/omnet/AribaOmnetModule.cpp \
    122161  communication/modules/transport/omnet/AribaOmnetModule.h
    123162endif
    124163
     164#------------> communication :: modules :: transport :: protlib
     165
    125166if OMNET
    126167else
    127 #communication :: modules :: transport :: protlib
    128168libariba_la_SOURCES += \
    129169  communication/modules/transport/protlib/timer_module.cpp \
    … …  
    149189  communication/modules/transport/protlib/fastqueue.c \
    150190  communication/modules/transport/protlib/eclock_gettime.c \
    151   communication/modules/transport/protlib/testqueue.c \
     191  communication/modules/transport/protlib/testqueue.c
     192
     193nobase_libariba_la_HEADERS += \
    152194  communication/modules/transport/protlib/tp_over_uds.h \
    153195  communication/modules/transport/protlib/threadsafe_db.h \
    … …  
    179221endif
    180222
     223#------------> communication :: modules :: transport :: tcp
     224
    181225if OMNET
    182226else
    183 #communication :: modules :: transport :: tcp
    184227libariba_la_SOURCES += \
    185228  communication/modules/transport/tcp/TCPTransport.cpp \
     229  communication/modules/transport/tcp/TCPTransportLocator.cpp
     230
     231nobase_libariba_la_HEADERS += \
    186232  communication/modules/transport/tcp/TCPTransport.h \
    187   communication/modules/transport/tcp/TCPTransportLocator.cpp \
    188233  communication/modules/transport/tcp/TCPTransportLocator.h
    189234endif
    190235
    191 #communication :: networkinfo
     236#------------> communication :: networkinfo
     237
    192238libariba_la_SOURCES += \
    193239  communication/networkinfo/AddressInformation.cpp \
     240  communication/networkinfo/NetworkChangeDetection.cpp \
     241  communication/networkinfo/NetworkInformation.cpp \
     242  communication/networkinfo/NetworkInterface.cpp
     243
     244nobase_libariba_la_HEADERS += \
    194245  communication/networkinfo/AddressInformation.h \
    195   communication/networkinfo/NetworkChangeDetection.cpp \
    196246  communication/networkinfo/NetworkChangeDetection.h \
    197247  communication/networkinfo/NetworkChangeInterface.h \
    198248  communication/networkinfo/NetworkInterface.h \
    199   communication/networkinfo/NetworkInformation.cpp \
    200   communication/networkinfo/NetworkInformation.h \
    201   communication/networkinfo/NetworkInterface.cpp
    202 
    203 #interface
     249  communication/networkinfo/NetworkInformation.h
     250
     251#------------> interface
     252
    204253libariba_la_SOURCES += \
    205254  interface/UnderlayAbstraction.cpp \
     255  interface/AribaContext.cpp \
     256  interface/ServiceInterface.cpp
     257
     258nobase_libariba_la_HEADERS += \
    206259  interface/UnderlayAbstraction.h \
    207   interface/AribaContext.cpp \
    208260  interface/AribaContext.h \
    209   interface/ServiceInterface.cpp \
    210261  interface/ServiceInterface.h
    211262
    212 #overlay
     263#------------> overlay
     264
    213265libariba_la_SOURCES += \
    214266  overlay/BaseOverlay.cpp \
     267  overlay/OverlayEvents.cpp
     268
     269nobase_libariba_la_HEADERS += \
    215270  overlay/BaseOverlay.h \
    216   overlay/OverlayEvents.cpp \
    217271  overlay/OverlayEvents.h
    218272
    219 #overlay :: messages
     273#------------> overlay :: messages
     274
    220275libariba_la_SOURCES += \
    221276  overlay/messages/JoinReply.cpp \
     277  overlay/messages/JoinRequest.cpp \
     278  overlay/messages/OverlayMsg.cpp
     279
     280nobase_libariba_la_HEADERS += \
    222281  overlay/messages/JoinReply.h \
    223   overlay/messages/JoinRequest.cpp \
    224282  overlay/messages/JoinRequest.h \
    225   overlay/messages/OverlayMsg.cpp \
    226283  overlay/messages/OverlayMsg.h
    227284
    228 #overlay :: modules
     285#------------> overlay :: modules
     286
    229287libariba_la_SOURCES += \
    230288  overlay/modules/OverlayStructureEvents.cpp \
     289  overlay/modules/OverlayFactory.cpp \
     290  overlay/modules/OverlayInterface.cpp
     291
     292nobase_libariba_la_HEADERS += \
    231293  overlay/modules/OverlayStructureEvents.h \
    232   overlay/modules/OverlayFactory.cpp \
    233294  overlay/modules/OverlayFactory.h \
    234   overlay/modules/OverlayInterface.cpp \
    235295  overlay/modules/OverlayInterface.h
    236296
    237 #overlay :: modules :: chord
    238 # libariba_la_SOURCES += \
    239 #   overlay/modules/chord/ChordSuccessorList.h \
    240 #   overlay/modules/chord/Chord.h \
    241 #   overlay/modules/chord/ChordFingerTable.h \
    242 #   overlay/modules/chord/ChordSuccessorList.cc \
    243 #   overlay/modules/chord/Chord.cc \
    244 #   overlay/modules/chord/ChordFingerTable.cc
    245 
    246 #overlay :: modules :: onehop
     297#------------> overlay :: modules :: onehop
     298
    247299libariba_la_SOURCES += \
    248300  overlay/modules/onehop/OneHop.cpp \
     301  overlay/modules/onehop/messages/OneHopMessage.cpp \
     302  overlay/modules/onehop/messages/NodeListingRequest.cpp \
     303  overlay/modules/onehop/messages/NodeListingReply.cpp
     304
     305nobase_libariba_la_HEADERS += \
    249306  overlay/modules/onehop/OneHop.h \
    250   overlay/modules/onehop/messages/OneHopMessage.cpp \
    251307  overlay/modules/onehop/messages/OneHopMessage.h \
    252   overlay/modules/onehop/messages/NodeListingRequest.cpp \
    253308  overlay/modules/onehop/messages/NodeListingRequest.h \
    254   overlay/modules/onehop/messages/NodeListingReply.cpp \
    255309  overlay/modules/onehop/messages/NodeListingReply.h
    256310
    257 #utility
    258 libariba_la_SOURCES += \
     311#------------> utility
     312
     313nobase_libariba_la_HEADERS += \
    259314  utility/types.h \
    260315  utility/messages.h \
    261316  utility/serialization.h
    262317
    263 #utility :: configuration
     318#------------> utility :: configuration
     319
    264320libariba_la_SOURCES += \
    265321  utility/configuration/ConfigFile.cpp \
     322  utility/configuration/Configuration.cpp
     323
     324nobase_libariba_la_HEADERS += \
    266325  utility/configuration/ConfigFile.h \
    267   utility/configuration/Configuration.cpp \
    268326  utility/configuration/Configuration.h
    269327
    270 #utility :: internal
    271 libariba_la_SOURCES += \
     328#------------> utility :: internal
     329
     330nobase_libariba_la_HEADERS += \
    272331  utility/internal/Utilities.hpp
    273332
    274 #utility :: logging
    275 libariba_la_SOURCES += \
     333#------------> utility :: logging
     334
     335nobase_libariba_la_HEADERS += \
    276336  utility/logging/Logging.h
    277337
    278 #utility :: measurement
    279 libariba_la_SOURCES += \
    280   utility/measurement/PathloadMeasurement.cpp \
     338#------------> utility :: measurement
     339
     340libariba_la_SOURCES += \
     341  utility/measurement/PathloadMeasurement.cpp
     342
     343nobase_libariba_la_HEADERS += \
    281344  utility/measurement/PathloadMeasurement.h
    282345
    283 #utility :: messages
    284 libariba_la_SOURCES += \
     346#------------> utility :: messages
     347
     348libariba_la_SOURCES += \
     349  utility/messages/Message.cpp \
     350  utility/messages/MessageControlInfo.cpp \
     351  utility/messages/MessageProvider.cpp \
     352  utility/messages/MessageReceiver.cpp \
     353  utility/messages/MessageSender.cpp \
     354  utility/messages/TextMessage.cpp
     355
     356nobase_libariba_la_HEADERS += \
    285357  utility/messages/_namespace.h \
    286   utility/messages/Message.cpp \
    287358  utility/messages/Message.h \
    288   utility/messages/MessageControlInfo.cpp \
    289359  utility/messages/MessageControlInfo.h \
    290   utility/messages/MessageProvider.cpp \
    291360  utility/messages/MessageProvider.h \
    292   utility/messages/MessageReceiver.cpp \
    293361  utility/messages/MessageReceiver.h \
    294   utility/messages/MessageSender.cpp \
    295362  utility/messages/MessageSender.h \
    296363  utility/messages/MessageUtilities.h \
    297   utility/messages/TextMessage.cpp \
    298364  utility/messages/TextMessage.h
    299365
    300 #utility :: misc
    301 libariba_la_SOURCES += \
     366#------------> utility :: misc
     367
     368libariba_la_SOURCES += \
     369  utility/misc/Helper.cpp \
     370  utility/misc/OvlVis.cpp \
     371  utility/misc/sha1.cpp \
     372  utility/misc/StringFormat.cpp
     373
     374nobase_libariba_la_HEADERS += \
    302375  utility/misc/Demultiplexer.hpp \
    303   utility/misc/Helper.cpp \
    304376  utility/misc/Helper.h \
    305377  utility/misc/KeyMapping.hpp \
    306   utility/misc/OvlVis.cpp \
    307378  utility/misc/OvlVis.h \
    308   utility/misc/sha1.cpp \
    309379  utility/misc/sha1.h \
    310   utility/misc/StringFormat.cpp \
    311   utility/misc/StringFormat.h
    312  
    313 
    314 #utility :: serialization
    315 libariba_la_SOURCES += \
    316   utility/serialization/Serialization.cpp \
     380  utility/misc/StringFormat.h
     381
     382#------------> utility :: serialization
     383
     384libariba_la_SOURCES += \
     385  utility/serialization/Serialization.cpp
     386
     387nobase_libariba_la_HEADERS += \
    317388  utility/serialization/DataUtilities.hpp \
    318389  utility/serialization/Serialization.hpp \
    … …  
    320391  utility/serialization/DataStream.hpp
    321392
    322 #utility :: system
     393#------------> utility :: system
     394
    323395libariba_la_SOURCES += \
    324396  utility/system/BlockingMethod.cpp \
     397  utility/system/SystemEvent.cpp \
     398  utility/system/SystemEventListener.cpp \
     399  utility/system/SystemEventType.cpp \
     400  utility/system/SystemQueue.cpp \
     401  utility/system/Timer.cpp \
     402  utility/system/StartupWrapper.cpp
     403
     404nobase_libariba_la_HEADERS += \
    325405  utility/system/BlockingMethod.h \
    326   utility/system/SystemEvent.cpp \
    327406  utility/system/SystemEvent.h \
    328   utility/system/SystemEventListener.cpp \
    329407  utility/system/SystemEventListener.h \
    330   utility/system/SystemEventType.cpp \
    331408  utility/system/SystemEventType.h \
    332   utility/system/SystemQueue.cpp \
    333409  utility/system/SystemQueue.h \
    334   utility/system/Timer.cpp \
    335410  utility/system/Timer.h \
    336   utility/system/StartupWrapper.cpp \
    337411  utility/system/StartupWrapper.h \
    338412  utility/system/StartupInterface.h
    339413
    340 #utility :: types
    341 libariba_la_SOURCES += \
     414#------------> utility :: types
     415
     416libariba_la_SOURCES += \
     417  utility/types/Address.cpp \
     418  utility/types/Identifier.cpp \
     419  utility/types/LinkID.cpp \
     420  utility/types/Locator.cpp \
     421  utility/types/NodeID.cpp \
     422  utility/types/OverlayParameterSet.cpp \
     423  utility/types/QoSParameterSet.cpp \
     424  utility/types/SecurityParameterSet.cpp \
     425  utility/types/ServiceID.cpp \
     426  utility/types/SpoVNetID.cpp
     427
     428nobase_libariba_la_HEADERS += \
    342429  utility/types/_namespace.h \
    343   utility/types/Address.cpp \
    344430  utility/types/Address.h \
    345431  utility/types/Data.hpp \
    346   utility/types/Identifier.cpp \
    347432  utility/types/Identifier.h \
    348   utility/types/LinkID.cpp \
    349433  utility/types/LinkID.h \
    350   utility/types/Locator.cpp \
    351434  utility/types/Locator.h \
    352   utility/types/NodeID.cpp \
    353435  utility/types/NodeID.h \
    354   utility/types/OverlayParameterSet.cpp \
    355436  utility/types/OverlayParameterSet.h \
    356   utility/types/QoSParameterSet.cpp \
    357437  utility/types/QoSParameterSet.h \
    358   utility/types/SecurityParameterSet.cpp \
    359438  utility/types/SecurityParameterSet.h \
    360   utility/types/ServiceID.cpp \
    361439  utility/types/ServiceID.h \
    362   utility/types/SpoVNetID.cpp \
    363440  utility/types/SpoVNetID.h
    364 
    365 # make install stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    366 
    367 # libariba_ladir = ${pkgincludedir}
    368 #
    369 # #interfaces headers for make install - don't
    370 # #remove the here listed .h files from _SOURCES!
    371 # libariba_la_HEADERS = \
    372 #   tidy/ariba.h \
    373 #   tidy/AribaModule.h \
    374 #   tidy/DataMessage.h \
    375 #   tidy/Identifiers.h \
    376 #   tidy/LinkProperties.h \
    377 #   tidy/Module.h \
    378 #   tidy/Name.h \
    379 #   tidy/Node.h \
    380 #   tidy/NodeListener.h \
    381 #   tidy/SpoVNetProperties.h \
    382 #   tidy/TidyCommunicationListener.h \
    383 #   tidy/TidyMessage.h
    384 
    385 # old make install stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    386 
    387 #autotools does not support hierarchical folders in the header dir
    388 #so we copy them on our own using, similar to 14.3 in the autobook
    389 # header files to install - TODO: extract all *.h and *.hpp files ~~~~
    390 
    391 libariba_ladir = ${pkgincludedir}
    392 
    393 install-data-local:
    394         @for f in $(libariba_la_SOURCES); do \
    395                 d=`echo $$f | sed -e 's,/[^/]*$$,,'`; \
    396                 $(mkinstalldirs) $(DESTDIR)$(libariba_ladir)/$$d; \
    397                 if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
    398                 $(INSTALL_DATA) $$p $(DESTDIR)$(libariba_ladir)/$$f; \
    399         done
    400 
    401 uninstall-local:
    402         rm -rf $(DESTDIR)$(libariba_ladir)
Note: See TracChangeset for help on using the changeset viewer.