Changeset 12:3696a9f93983 in xplra

Timestamp:

01/20/13 10:28:25 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Customized the linking procedure

Files:

• Makefile.am (modified) (1 diff)
• bootstrap.sh (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/xplra/Makefile.am (modified) (3 diffs)

Makefile.am

@@ -1 +1 @@
 SUBDIRS=src
-ACLOCAL_AMFLAGS=-I m4

bootstrap.sh

@@ -7 +7 @@
 cd "${scriptdir}"
 
-libtoolize
-aclocal -I m4 -I $1
+#libtoolize
+aclocal -I $1
 automake -a
 autoconf

configure.ac

@@ -1 +1 @@
 AC_INIT(xplra, 0.1, ivaradi@gmail.com)
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign no-exeext])
 
-LT_INIT
-
-AM_PROG_AS
 AC_PROG_CC
 AC_PROG_CXX
-AC_CONFIG_MACRO_DIR([m4])
 
 PKG_PROG_PKG_CONFIG

src/xplra/Makefile.am

@@ -5 +5 @@
 AM_CPPFLAGS=-DXPLM210
 
-if TARGET_API_WIN32
-AM_CPPFLAGS+=-DIBM
-AM_LDFLAGS=@XPSDK_LDFLAGS@ -no-undefined
-if TARGET_API_WIN64
-AM_LDFLAGS+=-lXPLM_64
-else
-AM_LDFLAGS+=-lXPLM
-endif
-endif
-
-if TARGET_API_POSIX
-AM_CPPFLAGS+=-DLIN
-AM_CXXFLAGS+=-fPIC -fno-stack-protector
-AM_LDFLAGS=-rdynamic -nodefaultlibs -undefined_warning -Wl,-version-script=$(srcdir)/version.ldscript
-endif
-
-
-lib_LTLIBRARIES=libxplra.la
-
-libxplra_la_SOURCES= \
+SRCS= \
         plugin.cc                       \
         ListenThread.cc                 \
@@ -36 +17 @@
         GetMultiDataRefRequest.cc       \
         SetMultiDataRefRequest.cc
-
-libxplra_la_LIBADD=$(VSCPL_LIBS) $(LIBXPLCOMMON_LIBS)
 
 noinst_HEADERS= \
@@ -53 +32 @@
         GetMultiDataRefRequest.h        \
         SetMultiDataRefRequest.h
+
+if TARGET_API_POSIX
+AM_CPPFLAGS+=-DLIN
+AM_CXXFLAGS+=-fPIC -fno-stack-protector
+AM_LDFLAGS=-shared -rdynamic -nodefaultlibs -undefined_warning -Wl,-version-script=$(srcdir)/version.ldscript
+noinst_PROGRAMS=lin.xpl
+lin_xpl_SOURCES=$(SRCS)
+lin_xpl_LDADD=$(VSCPL_LIBS) $(LIBXPLCOMMON_LIBS)
+endif
+
+if TARGET_API_WIN32
+AM_CPPFLAGS+=-DIBM
+AM_LDFLAGS=-shared -Wl,--enable-auto-image-base
+
+noinst_PROGRAMS=win.xpl
+win_xpl_SOURCES=$(SRCS)
+
+win_xpl_LDADD=@XPSDK_LDFLAGS@
+if TARGET_API_WIN64
+win_xpl_LDADD+=-lXPLM_64
+else
+win_xpl_LDADD+=-lXPLM
+endif
+win_xpl_LDADD+=$(VSCPL_LIBS) $(LIBXPLCOMMON_LIBS)
+endif