- added a patched libtool version for cross-compiling win32 dll's

- mingw32 framework updates
pipelka · May 4, 2007 · bbb98c7 · bbb98c7
1 parent 427079b
commit bbb98c7
Show file tree

Hide file tree

Showing 9 changed files with 14,563 additions and 15 deletions.
diff --git a/.cvsignore b/.cvsignore
@@ -15,8 +15,6 @@ compile
 confdefs.h
 config.guess
 config.sub
-libtool
-ltmain.sh
 build-stamp
 aeskulap-0.0.1
 bin

diff --git a/Makefile.am b/Makefile.am
@@ -57,15 +57,18 @@ rpm: dist
 
 dist-win32:
 	-rm -Rf /tmp/$(PACKAGE)-$(VERSION)
-	make prefix=/tmp/$(PACKAGE)-$(VERSION) install-strip
+	make prefix=/tmp/$(PACKAGE)-$(VERSION)$(prefix) install-strip
+	-cp -R -f /tmp/$(PACKAGE)-$(VERSION)$(prefix)/* /tmp/$(PACKAGE)-$(VERSION)
+	-rm -Rf /tmp/$(PACKAGE)-$(VERSION)$(prefix)
+	-rm -Rf /tmp/$(PACKAGE)-$(VERSION)/usr
 	if [ -f /tmp/$(PACKAGE)-$(VERSION)/bin/$(target_alias)-aeskulap.exe ] ; then \
 	    mv /tmp/$(PACKAGE)-$(VERSION)/bin/$(target_alias)-aeskulap.exe /tmp/$(PACKAGE)-$(VERSION)/bin/aeskulap.exe ; \
 	fi
 	for i in ofstd ijg8 ijg12 ijg16 dcmjpeg dcmdata dcmnet dcmimgle dcmimage dcmtls ; do \
 	    cp $(prefix)/bin/lib$$i.dll /tmp/$(PACKAGE)-$(VERSION)/bin ; \
-	    $(shell) $(STRIP) -g -S -d --strip-debug --strip-unneeded -x -X --remove-section=.comment --remove-section=.note /tmp/$(PACKAGE)-$(VERSION)/bin/lib$$i.dll ; \
 	done
-	$(shell) $(STRIP) -g -S -d --strip-debug --strip-unneeded -x -X --remove-section=.comment --remove-section=.note /tmp/$(PACKAGE)-$(VERSION)/bin/aeskulap.exe
+	$(shell) $(STRIP) -g -S -d --strip-debug --strip-unneeded -x -X --remove-section=.comment --remove-section=.note /tmp/$(PACKAGE)-$(VERSION)/bin/*.exe
+	$(shell) $(STRIP) -g -S -d --strip-debug --strip-unneeded -x -X --remove-section=.comment --remove-section=.note /tmp/$(PACKAGE)-$(VERSION)/bin/*.dll
 	-mv /tmp/$(PACKAGE)-$(VERSION)/bin/* /tmp/$(PACKAGE)-$(VERSION)
 	-rm -Rf /tmp/$(PACKAGE)-$(VERSION)/bin
 	-rm -Rf /tmp/$(PACKAGE)-$(VERSION)/lib

diff --git a/autogen.sh b/autogen.sh
@@ -74,12 +74,8 @@ autoheader || {
     exit 1
 }
 
-#echo "Running autopoint ..."
-#autopoint -f || ( echo "***ERROR*** autopoint failed." ; exit 1 )
-
-
 echo "Running libtoolize ..."
-libtoolize -f -c || {
+libtoolize --automake -c || {
     echo
     echo "**ERROR**: intltoolize failed. This may mean that you have not"
     echo "installed all of the packages you need. Please install the"

diff --git a/configuration/Makefile.am b/configuration/Makefile.am
@@ -1,4 +1,8 @@
+if BUILD_NOT_MINGW32
 pkglib_LTLIBRARIES = libconfiguration.la
+else
+lib_LTLIBRARIES = libconfiguration.la
+endif
 
 libconfiguration_la_SOURCES = \
 	awindowlevel.h \
@@ -12,7 +16,7 @@ libconfiguration_la_LIBADD = \
 	$(GTKMM_LIBS)
 
 libconfiguration_la_LDFLAGS = \
-	-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version
+	$(LDFLAGS_AESKULAP_LIBS)
 
 INCLUDES = \
 	$(GCONFMM_CFLAGS) \

diff --git a/configure.in b/configure.in
@@ -2,14 +2,13 @@ AC_PREREQ(2.52)
 
 AC_INIT(aeskulap, 0.2.2, pipelka@teleweb.at, aeskulap)
 
-AC_CANONICAL_TARGET
+dnl AC_CANONICAL_TARGET
 
 AM_CONFIG_HEADER(config.h)
 
 AM_INIT_AUTOMAKE(aeskulap, 0.2.2)
 
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
-AM_MAINTAINER_MODE
 
 case "$target" in
     *cygwin* | *mingw32*)
@@ -129,12 +128,15 @@ fi
 DCMTK_SUBDIR=""
 if test x"$MINGW32" = xno ; then
 DCMTK_SUBDIR="dcmtk"
+LDFLAGS_AESKULAP_LIBS="-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version"
 else
 LDFLAGS_MINGW32="-mwindows"
+LDFLAGS_AESKULAP_LIBS="-avoid-version -no-undefined"
 fi
 
 AC_SUBST(DCMTK_SUBDIR)
 AC_SUBST(LDFLAGS_MINGW32)
+AC_SUBST(LDFLAGS_AESKULAP_LIBS)
 
 AM_CONDITIONAL(BUILD_NOT_MINGW32, test x$MINGW32 = xno)
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+aeskulap (0.2.2-4) feisty; urgency=low
+
+  * added DICOMDIR support (patches from Gianluca Ghelli)
+
+ -- Alexander Pipelka <pipelka@shuttle.chello.at>  Fri,  4 May 2007 22:20:51 +0200
+
 aeskulap (0.2.2-3) feisty; urgency=low
 
   * packaging fix (include only needed files)

diff --git a/imagepool/Makefile.am b/imagepool/Makefile.am
@@ -1,4 +1,8 @@
+if BUILD_NOT_MINGW32
 pkglib_LTLIBRARIES = libimagepool.la
+else
+lib_LTLIBRARIES = libimagepool.la
+endif
 
 libimagepool_la_SOURCES = \
 	dicomdir.cpp \
@@ -33,12 +37,13 @@ libimagepool_la_SOURCES = \
 
 libimagepool_la_LIBADD = \
 	$(DCMTK_LIBS) \
-	../configuration/libconfiguration.la
+	$(GTKMM_LIBS) \
+	../configuration/libconfiguration.la \
 	-lpng \
 	-ltiff
 
 libimagepool_la_LDFLAGS = \
-	-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version
+	$(LDFLAGS_AESKULAP_LIBS)
 
 INCLUDES = \
 	-I$(top_srcdir)/configuration \