summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar mszulecki2007-02-27 16:58:03 +0000
committerGravatar mszulecki2007-02-27 16:58:03 +0000
commit5a424fb57eced532f61e7b3bd33e812313c915f1 (patch)
tree86f6f5b4dba2067ccb3a5d9944527def546f1bd5 /src
parent398c956e00c7a94eeb5b69238140ae32fbc29291 (diff)
downloaddskel-5a424fb57eced532f61e7b3bd33e812313c915f1.tar.gz
dskel-5a424fb57eced532f61e7b3bd33e812313c915f1.tar.bz2
Clean up makefile and actually don't link in statically what we link to dynamically already.
git-svn-id: http://svn.sukimashita.com/repos/dskel/trunk@19 4281df72-ff29-0410-8fee-2d9ac0c5f5a7
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a4689b..92d8df8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,17 @@
+CC=gdc
+
lib_LTLIBRARIES = libtestshlibrary.la
-libtestshlibrary_la_SOURCES = testshlibrary.d
-libtestshlibrary_la_LDFLAGS = -version-info 0:0:0 -module
+libtestshlibrary_la_SOURCES = testshlibrary.d
+libtestshlibrary_la_LDFLAGS = -version-info 0:0:0
-noinst_LIBRARIES = libtestlibrary.a
+lib_LIBRARIES = libtestlibrary.a
libtestlibrary_a_SOURCES = testlibrary.d
+# include_HEADERS = testshlibrary.di testlibrary.di
+
bin_PROGRAMS = helloworld
-helloworld_SOURCES = helloworld.d catalog.d testshlibrary.d
-helloworld_LDADD = $(DEPS_LIBS) $(top_srcdir)/config.d libtestlibrary.a libtestshlibrary.la
-# 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 $@
+helloworld_SOURCES = helloworld.d catalog.d
+helloworld_LDADD = $(DEPS_LIBS) $(top_srcdir)/config.d libtestlibrary.a testshlibrary.d libtestshlibrary.la
DFLAGS += -I$(top_srcdir) -I$(srcdir)