summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar mszulecki2007-02-26 01:56:28 +0000
committerGravatar mszulecki2007-02-26 01:56:28 +0000
commitde41ac9f6d7d3ee046719d69adf504b02ead30a2 (patch)
tree2ca0d70f4ee56f7fa142578ed860ef23abf02c60 /src
parent667123895db5adfd6515f630d0d6daa740b6576b (diff)
downloaddskel-de41ac9f6d7d3ee046719d69adf504b02ead30a2.tar.gz
dskel-de41ac9f6d7d3ee046719d69adf504b02ead30a2.tar.bz2
Finally fix libtool building, now static and shared libraries can be used for binaries!
git-svn-id: http://svn.sukimashita.com/repos/dskel/trunk@16 4281df72-ff29-0410-8fee-2d9ac0c5f5a7
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 947351c..6a4689b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,9 +6,12 @@ noinst_LIBRARIES = libtestlibrary.a
libtestlibrary_a_SOURCES = testlibrary.d
bin_PROGRAMS = helloworld
-helloworld_SOURCES = helloworld.d catalog.d
+helloworld_SOURCES = helloworld.d catalog.d testshlibrary.d
helloworld_LDADD = $(DEPS_LIBS) $(top_srcdir)/config.d libtestlibrary.a libtestshlibrary.la
-helloworld_LINK = $(GDC) $(DFLAGS) -o $@
+# It seems by overriding the _LINK primary, libtool is not called correctly
+# Requires fixing in the libtool macros/scripts
+CC=gdc
+#helloworld_LINK = $(GDC) $(DFLAGS) -o $@
DFLAGS += -I$(top_srcdir) -I$(srcdir)