[GNUnet-SVN] r7243 - in freeway: . native

[gnunet]

Author: mdonoughe
Date: 2008-06-15 11:30:25 -0600 (Sun, 15 Jun 2008)
New Revision: 7243

Modified:
   freeway/build.sh
   freeway/native/Makefile.am
Log:
reforming the build process


Modified: freeway/build.sh
===================================================================
--- freeway/build.sh    2008-06-15 17:30:21 UTC (rev 7242)
+++ freeway/build.sh    2008-06-15 17:30:25 UTC (rev 7243)
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Build Freeway and it's C libraries.
+# Build Freeway and its C libraries.
 #
 
-ant && javah -classpath build/classes -d native 
org.gnu.freeway.server.CPluginLoader && sh stg.sh && make || exit 1
+ant && make || exit 1
 cp native/.libs/lib*.so* etc/support/clib/.libs/*.so* native/.libs/lib*.dylib 
etc/support/clib/.libs/lib*.dylib build/ > /dev/null 2>&1
 mv build/libfreeway-clib.dylib build/libfreeway-clib.jnilib > /dev/null 2>&1
 mv build/libcpluginloader.dylib build/libcpluginloader.jnilib > /dev/null 2>&1

Modified: freeway/native/Makefile.am
===================================================================
--- freeway/native/Makefile.am  2008-06-15 17:30:21 UTC (rev 7242)
+++ freeway/native/Makefile.am  2008-06-15 17:30:25 UTC (rev 7243)
@@ -8,10 +8,18 @@
 libcpluginloader_la_LIBADD = \
   -lgnunetutil $(LIBINTL)
 
+BUILT_SOURCES = org_gnu_freeway_server_CPluginLoader.h switch-table.c
+
 libcpluginloader_la_SOURCES = core.c connection.c \
   handler.c tcpserver.c util.c jni.h java.c \
-  org_gnu_freeway_server_CPluginLoader.h gettext.h \
-  connection.h handler.h tcpserver.h util.h core.h \
+  org_gnu_freeway_server_CPluginLoader.h switch-table.c \
+  gettext.h connection.h handler.h tcpserver.h util.h core.h \
   trafficservice.c statsservice.c datastoreservice.c \
-  identityservice.c sqstoreservice.c 
+  identityservice.c sqstoreservice.c
 endif
+
+org_gnu_freeway_server_CPluginLoader.h: 
../build/classes/org/freeway/server/CPluginLoader
+       $(JAVAH) -classpath ../build/classes -d . 
org.gnu.freeway.server.CPluginLoader
+
+switch-table.c: ../build/freeway.jar
+       $(JAVA) -classpath ../build/freeway.jar 
org.gnu.freeway.cwrappers.util.SwitchTableGenerator