equal
deleted
inserted
replaced
54 LIBS_unix := -ljvm -ljava, \ |
54 LIBS_unix := -ljvm -ljava, \ |
55 LIBS_linux := $(LIBDL) -lpthread, \ |
55 LIBS_linux := $(LIBDL) -lpthread, \ |
56 LIBS_solaris := -lnsl -lsocket $(LIBDL), \ |
56 LIBS_solaris := -lnsl -lsocket $(LIBDL), \ |
57 LIBS_aix := $(LIBDL),\ |
57 LIBS_aix := $(LIBDL),\ |
58 LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib winhttp.lib \ |
58 LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib winhttp.lib \ |
59 urlmon.lib delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \ |
59 delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \ |
60 LIBS_macosx := -framework CoreFoundation -framework CoreServices, \ |
60 LIBS_macosx := -framework CoreFoundation -framework CoreServices, \ |
61 )) |
61 )) |
62 |
62 |
63 $(BUILD_LIBNET): $(BUILD_LIBJAVA) |
63 $(BUILD_LIBNET): $(BUILD_LIBJAVA) |
64 |
64 |