Removed separate Windows makefile.
authorThomas Lopatic <thomas@lopatic.de>
Tue, 9 Nov 2004 00:44:52 +0000 (00:44 +0000)
committerThomas Lopatic <thomas@lopatic.de>
Tue, 9 Nov 2004 00:44:52 +0000 (00:44 +0000)
Makefile
Makefile.win32.in [deleted file]
mkmf.sh [deleted file]

index ed1bdd4..9aa2640 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
-# $Id: Makefile,v 1.19 2004/11/08 01:54:05 tlopatic Exp $
+# $Id: Makefile,v 1.20 2004/11/09 00:44:52 tlopatic Exp $
 #
 
 #OS ?=         linux
@@ -105,7 +105,7 @@ HDRS +=             $(wildcard src/win32/*.h)
 OBJS +=                $(patsubst %.c,%.o,$(wildcard src/win32/*.c))
 
 CFLAGS ?=      -Isrc -Isrc/win32 -Wall -Wmissing-prototypes \
-               -Wstrict-prototypes -mno-cygwin -O2 -g -DWIN32
+               -Wstrict-prototypes -mno-cygwin -O2 -g -DWIN32 -DUSE_LINK_QUALITY
 
 LIBS =         -mno-cygwin -lws2_32 -liphlpapi
 
diff --git a/Makefile.win32.in b/Makefile.win32.in
deleted file mode 100644 (file)
index 8ea3c55..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-VERS =         0.4.8
-
-MAINOBJS =     src/build_msg.o \
-               src/duplicate_set.o \
-               src/generate_msg.o \
-               src/hashing.o \
-               src/hna_set.o \
-               src/hysteresis.o \
-               src/interfaces.o \
-               src/ipc_frontend.o \
-               src/link_set.o \
-               src/local_hna_set.o \
-               src/main.o \
-               src/mantissa.o \
-               src/mid_set.o \
-               src/mpr.o \
-               src/mpr_selector_set.o \
-               src/neighbor_table.o \
-               src/net.o \
-               src/olsr.o \
-               src/packet.o \
-               src/parser.o \
-               src/plugin.o \
-               src/plugin_loader.o \
-               src/process_package.o \
-               src/process_routes.o \
-               src/rebuild_packet.o \
-               src/routing_table.o \
-               src/scheduler.o \
-               src/socket_parser.o \
-               src/tc_set.o \
-               src/two_hop_neighbor_table.o \
-               src/cfgparser/oparse.o \
-               src/cfgparser/oscan.o \
-               src/cfgparser/olsrd_conf.o \
-               src/lq_packet.o \
-               src/win32/apm.o \
-               src/win32/compat.o \
-               src/win32/ifnet.o \
-               src/win32/kernel_routes.o \
-               src/win32/log.o \
-               src/win32/net.o \
-               src/win32/tunnel.o
-
-CONFDLLOBJS =  src/win32/olsrconf.def \
-               src/cfgparser/oparse.o \
-               src/cfgparser/oscan.o \
-               src/cfgparser/confdll-olsrd_conf.o \
-               src/win32/compat.o
-
-CONFEXEOBJS =  src/cfgparser/oparse.o \
-               src/cfgparser/oscan.o \
-               src/cfgparser/confexe-olsrd_conf.o \
-               src/win32/compat.o
-
-all:           olsrd.exe olsrconf.dll olsrconf.exe
-
-src/cfgparser/oscan.c: src/cfgparser/oscan.lex \
-               src/cfgparser/oparse.h src/cfgparser/olsrd_conf.h
-               flex -osrc/cfgparser/oscan.c src/cfgparser/oscan.lex
-
-src/cfgparser/oparse.c:        src/cfgparser/oparse.y src/cfgparser/olsrd_conf.h
-               bison -d -osrc/cfgparser/oparse.c src/cfgparser/oparse.y
-
-%.o:           %.c
-               gcc -mno-cygwin -O2 -Wall -c -DWIN32 \
-               -Isrc -Isrc/win32 -o$@ $<
-
-confdll-%.o:   %.c
-               gcc -mno-cygwin -O2 -Wall -c -DWIN32 -DMAKELIB \
-               -Isrc -Isrc/win32 -o$@ $<
-
-confexe-%.o:   %.c
-               gcc -mno-cygwin -O2 -Wall -c -DWIN32 -DMAKEBIN \
-               -Isrc -Isrc/win32 -o$@ $<
-
-olsrd.exe:     $(MAINOBJS)
-               gcc -mno-cygwin -o olsrd.exe $(MAINOBJS) -lws2_32 -liphlpapi
-
-olsrconf.dll:  $(CONFDLLOBJS)
-               gcc -mno-cygwin -shared -o olsrconf.dll $(CONFDLLOBJS) \
-               -lws2_32 -Wl,--out-implib,olsrconf.lib
-
-olsrconf.exe:  $(CONFEXEOBJS)
-               gcc -mno-cygwin -o olsrconf.exe $(CONFEXEOBJS) -lws2_32
-
-clean:
-               rm -f *.exe *.dll *.lib *.zip
-               rm -f src/cfgparser/oparse.c src/cfgparser/oparse.h
-               rm -f src/cfgparser/oscan.c
-               find . -name \*~ -exec rm -f {} \;
-               find src -name \*.o -exec rm -f {} \;
-
-mclean:                clean
-               rm -f Makefile.win32
-
-olsr-${VERS}.zip:      gui/win32/Main/Release/Switch.exe \
-               gui/win32/Shim/Release/Shim.exe \
-               olsrd.exe \
-               README-WIN32.txt \
-               gui/win32/Inst/linux-manual.txt \
-               files/olsrd.conf.default.win32 \
-               lib/dot_draw/olsrd_dot_draw.dll
-               rm -rf ${TEMP}/olsr-${VERS}
-               rm -f ${TEMP}/olsr-${VERS}.zip
-               rm -f olsr-${VERS}.zip
-               mkdir ${TEMP}/olsr-${VERS}
-               cp gui/win32/Main/Release/Switch.exe ${TEMP}/olsr-${VERS}
-               cp gui/win32/Shim/Release/Shim.exe ${TEMP}/olsr-${VERS}
-               cp olsrd.exe ${TEMP}/olsr-${VERS}
-               cp README-WIN32.txt ${TEMP}/olsr-${VERS}
-               cp gui/win32/Inst/linux-manual.txt ${TEMP}/olsr-${VERS}
-               cp files/olsrd.conf.default.win32 ${TEMP}/olsr-${VERS}/Default.olsr
-               cp lib/dot_draw/olsrd_dot_draw.dll ${TEMP}/olsr-${VERS}
-               cd ${TEMP}; echo y | cacls olsr-${VERS} /T /G Everyone:F
-               cd ${TEMP}; zip -q -r olsr-${VERS}.zip olsr-${VERS}
-               cp ${TEMP}/olsr-${VERS}.zip .
-               rm -rf ${TEMP}olsr-${VERS}
-               rm -f ${TEMP}/olsr-${VERS}.zip
-
-olsr-${VERS}-setup.exe:        gui/win32/Main/Release/Switch.exe \
-               gui/win32/Shim/Release/Shim.exe \
-               olsrd.exe \
-               README-WIN32.txt \
-               gui/win32/Inst/linux-manual.txt \
-               files/olsrd.conf.default.win32 \
-               lib/dot_draw/olsrd_dot_draw.dll \
-               gui/win32/Inst/installer.nsi
-               rm -f olsr-setup.exe
-               rm -f olsr-${VERS}-setup.exe
-               C:/Program\ Files/NSIS/makensis gui\win32\Inst\installer.nsi
-               mv olsr-setup.exe olsr-${VERS}-setup.exe
-
diff --git a/mkmf.sh b/mkmf.sh
deleted file mode 100755 (executable)
index 7cf573a..0000000
--- a/mkmf.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-srcs="\
-    src/build_msg.c \
-    src/duplicate_set.c \
-    src/generate_msg.c \
-    src/hashing.c \
-    src/hna_set.c \
-    src/hysteresis.c \
-    src/interfaces.c \
-    src/ipc_frontend.c \
-    src/link_set.c \
-    src/local_hna_set.c \
-    src/main.c \
-    src/mantissa.c \
-    src/mid_set.c \
-    src/mpr.c \
-    src/mpr_selector_set.c \
-    src/neighbor_table.c \
-    src/net.c \
-    src/olsr.c \
-    src/packet.c \
-    src/parser.c \
-    src/plugin.c \
-    src/plugin_loader.c \
-    src/process_package.c \
-    src/process_routes.c \
-    src/rebuild_packet.c \
-    src/routing_table.c \
-    src/scheduler.c \
-    src/socket_parser.c \
-    src/tc_set.c \
-    src/two_hop_neighbor_table.c \
-    src/cfgparser/olsrd_conf.c \
-    src/win32/apm.c \
-    src/win32/compat.c \
-    src/win32/ifnet.c \
-    src/win32/kernel_routes.c \
-    src/win32/log.c \
-    src/win32/net.c \
-    src/win32/tunnel.c \
-    "
-
-rm -f Makefile.win32
-cp Makefile.win32.in Makefile.win32
-
-echo >>Makefile.win32
-echo \# >>Makefile.win32
-echo \# DEPENDENCIES >>Makefile.win32
-echo \# >>Makefile.win32
-
-for f in $srcs; do
-    echo >>Makefile.win32
-    echo \# $f >>Makefile.win32
-    echo >>Makefile.win32
-
-    o=`echo $f | sed -e 's/c$/o/'`
-
-    gcc -MM -MT $o -mno-cygwin -O2 -Wall -c -DWIN32 -DDEBUG -Isrc -Isrc/win32 $f >>Makefile.win32
-done