diff options
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Main.cc | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 9 |
4 files changed, 9 insertions, 11 deletions
diff --git a/configure.in b/configure.in index dddbe49..9f85a9b 100644 --- a/configure.in +++ b/configure.in @@ -1,13 +1,13 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/Main.cc) -Baltisot_MAJOR_VERSION=1 -Baltisot_MINOR_VERSION=0 +Baltisot_MAJOR_VERSION=0 +Baltisot_MINOR_VERSION=1 Baltisot_MICRO_VERSION=0 Baltisot_VERSION=$Baltisot_MAJOR_VERSION.$Baltisot_MINOR_VERSION.$Baltisot_MICRO_VERSION -dnl set version info for Baltisot.so to package rev - $MAJOR + $MINOR : $MICRO : $MINOR -Baltisot_VERSION_INFO=1:0:0 +dnl set version info for Baltisot.so to package rev - $MAJOR . $MINOR : $MICRO +Baltisot_VERSION_INFO=$Baltisot_MAJOR_VERSION.$Baltisot_MINOR_VERSION.$Baltisot_MICRO_VERSION AC_SUBST(Baltisot_MAJOR_VERSION) AC_SUBST(Baltisot_MINOR_VERSION) diff --git a/lib/Makefile.am b/lib/Makefile.am index a9d8bc4..58cc6e7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -9,4 +9,4 @@ libBaltisot_la_SOURCES = Exceptions.cc Handle.cc Output.cc String.cc\ Socket.cc Input.cc HttpServ.cc Variables.cc Action.cc Menu.cc Message.cc\ Form.cc Confirm.cc Table.cc checkargs.c datecalc.c -libBaltisot_la_LDFLAGS = -version-info $(Baltisot_VERSION_INFO) +libBaltisot_la_LDFLAGS = -release $(Baltisot_VERSION_INFO) diff --git a/src/Main.cc b/src/Main.cc index d4692a1..ffadd67 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -10,7 +10,6 @@ #include "Form.h" #include "Confirm.h" #include "Table.h" -#include "admin.h" class InPipe : public Handle { public: diff --git a/src/Makefile.am b/src/Makefile.am index b5ed47a..20c7ab2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,11 +4,10 @@ AM_CFLAGS = -O3 -Wall -Wstrict-prototypes $(CFLAGS) AM_CXXFLAGS = -O3 -Wall -Wstrict-prototypes $(CXXFLAGS) INCLUDES = -I. -I.. -I$(includedir) -I../include -bin_PROGRAMS = Main +bin_PROGRAMS = Baltisot -Main_SOURCES = Main.cc +Baltisot_SOURCES = Main.cc -clean: - rm -f admin?.o admin?.pc +LDADD = ../lib/libBaltisot.la -Main_LDADD = $(LDADD) +Baltisot_LDADD = $(LDADD) |