Revert James' patch to simplify the Win32/64 build process

diff --git a/bacula/src/win32/lib/Makefile b/bacula/src/win32/lib/Makefile
index d2d4a52e1a2a11cba7cee20b9be3e51d5fd7605d..619dc50ca5facf5cec52bdd085bfd3274b677779 100644 (file)
--- a/bacula/src/win32/lib/Makefile
+++ b/bacula/src/win32/lib/Makefile
@@ -134,10 +134,6 @@ clean:
 # Rules for generating from ../lib
 #
 
-bacula$(WIN_VERSION).def: $(DLL_OBJS)
-       ./make_def $(WIN_VERSION) $(DLL_OBJS) >bacula$(WIN_VERSION).def.new && \
-         mv bacula$(WIN_VERSION).def.new bacula$(WIN_VERSION).def
-
 $(LIBDIR)/libbacula.a: DLL_DEFINE=USING_DLL
 
 $(LIBDIR)/libbacula.a: $(BINDIR)/bacula.dll $(STATIC_OBJS)

diff --git a/bacula/src/win32/lib/make_def b/bacula/src/win32/lib/make_def
index aaad7d0576ccae9fca36e0bdb2b266579f42696b..89d21cbcd2de6f36d42f623a02a571a003dc198a 100755 (executable)
--- a/bacula/src/win32/lib/make_def
+++ b/bacula/src/win32/lib/make_def
@@ -4,47 +4,27 @@
 #    manually
 #
 #  Kern Sibbald, June 2007
-#  Rewritten by James Harper, October 2009
 #
 
-
-FILES="$@"
-if [ "$FILES" = "" ]
-then
-  exit 1
-fi
-
-TOPDIR=`(cd ../../../..;pwd)`
+TOPDIR=`(cd ../../..;pwd)`
 TOPDIR=${DEPKGS:-${TOPDIR}}
-VERSION=$1
-shift
-if [ "$VERSION" = 64 ]; then
-   NM=${TOPDIR}/cross-tools/mingw-w64/bin/mingw32-nm
-elif [ "$VERSION" = 32 ]; then
-   NM=${TOPDIR}/cross-tools/mingw32/mingw32/bin/nm
-else 
-   echo "Usage: make_def [32|64] *.o" >&2
-   exit 1
-fi
-
-echo LIBRARY bacula.dll
-echo EXPORTS
-echo ""
+NM=${TOPDIR}/cross-tools/mingw32/mingw32/bin/nm
+ 
+echo "LIBRARY bacula.dll"
+echo "EXPORTS"
+echo " "
 
-$NM \
- --defined-only --extern-only $@ | while read addr type sym
-do
- sym=`echo $sym | cut -c2-`
- case "$type" in
-  "B")
-   echo $sym DATA
-   ;;
-  "T")
-   echo $sym
-   ;;
-  "")
-   echo "; $addr"
-   ;;
- esac
+cd obj32
+for i in *.o ; do \
+   echo "; $i"; \
+   ${NM} $i | grep "^[0-9a-f]* T _" | cut -c13- ; \
+   echo " "; \
 done
 
+DATA="\
+   console_command \
+   plugin_list"
+
+for i in ${DATA}; do \
+   echo "$i DATA"; \
+done

diff --git a/bacula/technotes b/bacula/technotes
index 2e8c69454caad273a04f37a838ea0326ffad1e0f..2106f6299b75d4301ccdd554fa81c89a030e3d96 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -8,8 +8,6 @@ ebl  Add readline completion support for bconsole. It gives help
      It works with --disable-conio and --with-readline=/usr/include/readline
 25Oct09
 mvw  Add support for running tape mount and unmount commands
-ebl  Apply James make_def version to simplify the link process for Windows
-ebl  Update it for win64.
 23Oct09
 kes  When dequeuing messages, don't allow queuing more, but send them
      to syslog. Fixes Eric's messages-test regression script.