[GNUnet-SVN] r8203 - in GNUnet: contrib/macosx src

[gnunet]

Author: holindho
Date: 2009-02-08 08:40:48 -0700 (Sun, 08 Feb 2009)
New Revision: 8203

Modified:
   GNUnet/contrib/macosx/build-osx-framework.sh
   GNUnet/src/Makefile.am
Log:
move building framework to the script


Modified: GNUnet/contrib/macosx/build-osx-framework.sh
===================================================================
--- GNUnet/contrib/macosx/build-osx-framework.sh        2009-02-07 20:40:50 UTC 
(rev 8202)
+++ GNUnet/contrib/macosx/build-osx-framework.sh        2009-02-08 15:40:48 UTC 
(rev 8203)
@@ -525,11 +525,25 @@
                find ./ -type f -name "Makefile" |      \
                        xargs perl -pi -w -e "s#-lintl#-lintl -liconv#g;"
                if ! ( test $build_retval = 0 && make clean &&          \
-                       make DESTDIR="${SDK_PATH}" install &&           \
+                       make DESTDIR="${SDK_PATH}" install )
+               then
+                       build_retval=1
+               fi
+               if ! ( test $build_retval = 0 && \
+                       gcc -dynamiclib -install_name "${FW_DIR}/GNUnet" \
+                       -compatibility_version 1 -current_version 1.0 \
+                       -o "${SDK_PATH}/${FW_DIR}/GNUnet" \
+                       ${LDFLAGS} \
+                       -L"${SDK_PATH}/${FW_DIR}/lib" \
+                       -sub_library libgnunetutil \
+                       -sub_library libgnunetsetup \
+                       -lgnunetutil \
+                       -lgnunetsetup && \
                        touch "${BUILD_DIR}/built-GNUnet-${ARCH_NAME}" )
                then
                        build_retval=1
                fi
+                       
                cp -v config.log "${BUILD_DIR}/config.log-GNUnet-${ARCH_NAME}"
                cp -v config.h "${BUILD_DIR}/config.h-GNUnet-${ARCH_NAME}"
                unset CPPFLAGS
@@ -834,6 +848,7 @@
 do
        install_executable_to_framework "$tfn"
 done
+install_executable_to_framework "GNUnet"
 for tfn in lib/GNUnet/libgnunet*so
 do
        install_executable_to_framework "$tfn"
@@ -875,7 +890,6 @@
        install_message_catalog_to_framework "$tfn"
 done
 install_en_message_catalog_to_framework "./po/GNUnet.pot"
-make_framework_link "lib/libgnunet.dylib" "GNUnet"
 make_framework_link "lib" "Libraries"
 make_framework_link "lib/GNUnet" "PlugIns"
 make_framework_link "include/GNUnet" "Headers"

Modified: GNUnet/src/Makefile.am
===================================================================
--- GNUnet/src/Makefile.am      2009-02-07 20:40:50 UTC (rev 8202)
+++ GNUnet/src/Makefile.am      2009-02-08 15:40:48 UTC (rev 8203)
@@ -4,29 +4,3 @@
 
 SUBDIRS = include $(INTLEMU_SUBDIRS) util libs setup server transports 
applications
 
-if WANT_FRAMEWORK
-lib_LTLIBRARIES = libgnunet.la
-endif
-
-libgnunet_la_SOURCES =
-libgnunet_la_LIBADD = \
- util/libgnunetutil.la \
- setup/lib/libgnunetsetup.la \
- applications/fs/libgnunetecrs_core.la \
- applications/fs/lib/libgnunetfs.la \
- applications/rpc/libgnunetrpc_util.la \
- applications/identity/libgnunetidentity_api.la \
- applications/getoption/libgnunetgetoption_api.la \
- applications/dht/tools/libgnunetdht_api.la \
- applications/stats/libgnunetstats_api.la \
- applications/tracekit/libgnunettracekit_api.la \
- applications/traffic/libgnunettraffic_api.la \
- applications/chat/lib/libgnunetchat_api.la \
- applications/testing/libgnunetremote_api.la \
- applications/testing/libgnunettesting_api.la \
- applications/fs/ecrs/libgnunetecrs.la \
- applications/fs/uritrack/libgnuneturitrack.la \
- applications/fs/namespace/libgnunetnamespace.la \
- applications/fs/fsui/libgnunetfsui.la \
- applications/fs/collection/libgnunetcollection.la
-