fix the library after the rename operation

This commit is contained in:
Emiel Bruijntjes 2014-01-07 01:17:09 -08:00
parent 0ee6348ddc
commit 5680ea8f11
11 changed files with 70 additions and 70 deletions

View File

@ -15,9 +15,9 @@ clean:
$(MAKE) -C src clean
install:
mkdir -p ${INCLUDE_DIR}/libamqp
mkdir -p ${INCLUDE_DIR}/amqpcpp
mkdir -p ${LIBRARY_DIR}
cp -f libamqp.h ${INCLUDE_DIR}
cp -f include/*.h ${INCLUDE_DIR}/libamqp
cp -f src/liblibamqp.so ${LIBRARY_DIR}
cp -f src/liblibamqp.a ${LIBRARY_DIR}
cp -f amqpcpp.h ${INCLUDE_DIR}
cp -f include/*.h ${INCLUDE_DIR}/amqpcpp
cp -f src/libamqpcpp.so ${LIBRARY_DIR}
cp -f src/libamqpcpp.a ${LIBRARY_DIR}

58
amqpcpp.h Normal file
View File

@ -0,0 +1,58 @@
/**
* AMQP.h
*
* Starting point for all includes of the Copernica AMQP library
*
* @documentation public
*/
// base C++ include files
#include <vector>
#include <string>
#include <memory>
#include <map>
#include <queue>
#include <set>
#include <limits>
#include <cstddef>
#include <cstring>
// base C include files
#include <stdint.h>
#include <math.h>
#include <endian.h>
// forward declarations
#include <amqpcpp/classes.h>
// utility classes
#include <amqpcpp/receivedframe.h>
#include <amqpcpp/outbuffer.h>
#include <amqpcpp/watchable.h>
// amqp types
#include <amqpcpp/field.h>
#include <amqpcpp/numericfield.h>
#include <amqpcpp/decimalfield.h>
#include <amqpcpp/stringfield.h>
#include <amqpcpp/booleanset.h>
#include <amqpcpp/fieldproxy.h>
#include <amqpcpp/table.h>
#include <amqpcpp/array.h>
// envelope for publishing and consuming
#include <amqpcpp/metadata.h>
#include <amqpcpp/envelope.h>
#include <amqpcpp/message.h>
// mid level includes
#include <amqpcpp/exchangetype.h>
#include <amqpcpp/flags.h>
#include <amqpcpp/channelhandler.h>
#include <amqpcpp/channelimpl.h>
#include <amqpcpp/channel.h>
#include <amqpcpp/login.h>
#include <amqpcpp/connectionhandler.h>
#include <amqpcpp/connectionimpl.h>
#include <amqpcpp/connection.h>

View File

@ -1 +0,0 @@
include

View File

@ -1,58 +0,0 @@
/**
* AMQP.h
*
* Starting point for all includes of the Copernica AMQP library
*
* @documentation public
*/
// base C++ include files
#include <vector>
#include <string>
#include <memory>
#include <map>
#include <queue>
#include <set>
#include <limits>
#include <cstddef>
#include <cstring>
// base C include files
#include <stdint.h>
#include <math.h>
#include <endian.h>
// forward declarations
#include <libamqp/classes.h>
// utility classes
#include <libamqp/receivedframe.h>
#include <libamqp/outbuffer.h>
#include <libamqp/watchable.h>
// amqp types
#include <libamqp/field.h>
#include <libamqp/numericfield.h>
#include <libamqp/decimalfield.h>
#include <libamqp/stringfield.h>
#include <libamqp/booleanset.h>
#include <libamqp/fieldproxy.h>
#include <libamqp/table.h>
#include <libamqp/array.h>
// envelope for publishing and consuming
#include <libamqp/metadata.h>
#include <libamqp/envelope.h>
#include <libamqp/message.h>
// mid level includes
#include <libamqp/exchangetype.h>
#include <libamqp/flags.h>
#include <libamqp/channelhandler.h>
#include <libamqp/channelimpl.h>
#include <libamqp/channel.h>
#include <libamqp/login.h>
#include <libamqp/connectionhandler.h>
#include <libamqp/connectionimpl.h>
#include <libamqp/connection.h>

View File

@ -3,7 +3,7 @@ RM = rm -f
CPPFLAGS = -Wall -c -I. -O2 -flto -std=c++11 -g
LD = g++
LD_FLAGS = -Wall -shared -O2
SHARED_LIB = liblibamqp.so
SHARED_LIB = libamqpcpp.so
STATIC_LIB = $(SHARED_LIB:%.so=%.a)
SOURCES = $(wildcard *.cpp)
SHARED_OBJECTS = $(SOURCES:%.cpp=%.o)

View File

@ -8,7 +8,7 @@
*/
// include the generic amqp functions
#include "../libamqp.h"
#include "../amqpcpp.h"
// classes that are very commonly used
#include "monitor.h"

View File

@ -1 +0,0 @@
../include

View File

@ -1,7 +1,7 @@
CPP = g++
CPPFLAGS = -Wall -c -I. -O2 -flto -std=c++11 -g
LD = g++
LDFLAGS = -llibamqp -lcopernica_event -lcopernica_network -lev
LDFLAGS = -lamqpcpp -lcopernica_event -lcopernica_network -lev
RESULT = a.out
SOURCES = $(wildcard *.cpp)
OBJECTS = $(SOURCES:%.cpp=%.o)

2
tests/README.md Normal file
View File

@ -0,0 +1,2 @@
I'm sorry, the test case makes use of the closed source Copernica libraries. Maybe someone
is willing to provide a test case based on plain system calls?

View File

@ -9,7 +9,7 @@
/**
* Global libraries that we need
*/
#include <libamqp.h>
#include <amqpcpp.h>
#include <copernica/network.h>
/**

View File

@ -7,7 +7,7 @@
/**
* Required external libraries
*/
#include <libamqp.h>
#include <amqpcpp.h>
#include <copernica/network.h>
#include <string>