|
Line
Link Here
|
| 0 |
-- configure |
0 |
++ configure |
|
Lines 391-397
Link Here
|
| 391 |
# check for Glib 2.0 compile CFLAGS |
391 |
# check for Glib 2.0 compile CFLAGS |
| 392 |
if $pkgconfig --exists glib-2.0; then |
392 |
if $pkgconfig --exists glib-2.0; then |
| 393 |
GLIB_CFLAGS=`$pkgconfig --cflags glib-2.0` |
393 |
GLIB_CFLAGS=`$pkgconfig --cflags glib-2.0` |
| 394 |
GLIB_LDFLAGS=`$pkgconfig --libs glib-2.0` |
394 |
GLIB_LIBS=`$pkgconfig --libs glib-2.0` |
| 395 |
GLIB_VERSION=`$pkgconfig --modversion glib-2.0` |
395 |
GLIB_VERSION=`$pkgconfig --modversion glib-2.0` |
| 396 |
else |
396 |
else |
| 397 |
echo "GLIB 2.0 environment not found" |
397 |
echo "GLIB 2.0 environment not found" |
|
Lines 404-410
Link Here
|
| 404 |
return 0; |
404 |
return 0; |
| 405 |
} |
405 |
} |
| 406 |
EOF |
406 |
EOF |
| 407 |
if ! $cc $CFLAGS $GLIB_CFLAGS $GLIB_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then |
407 |
if ! $cc $CFLAGS $GLIB_CFLAGS $TMPC -o $TMPE $GLIB_LIBS > /dev/null 2>&1; then |
| 408 |
echo "GLIB 2.0 environment not usable" |
408 |
echo "GLIB 2.0 environment not usable" |
| 409 |
rm -f $TMPC |
409 |
rm -f $TMPC |
| 410 |
exit 1 |
410 |
exit 1 |
|
Lines 415-421
Link Here
|
| 415 |
if test "$build_viewer" = "yes" -o "$build_player" = "yes"; then |
415 |
if test "$build_viewer" = "yes" -o "$build_player" = "yes"; then |
| 416 |
if $pkgconfig --exists gtk+-2.0; then |
416 |
if $pkgconfig --exists gtk+-2.0; then |
| 417 |
GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0` |
417 |
GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0` |
| 418 |
GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0` |
418 |
GTK_LIBS=`$pkgconfig --libs gtk+-2.0` |
| 419 |
GTK_VERSION=`$pkgconfig --modversion gtk+-2.0` |
419 |
GTK_VERSION=`$pkgconfig --modversion gtk+-2.0` |
| 420 |
else |
420 |
else |
| 421 |
echo "GTK+ 2.0 environment not found" |
421 |
echo "GTK+ 2.0 environment not found" |
|
Lines 428-434
Link Here
|
| 428 |
return 0; |
428 |
return 0; |
| 429 |
} |
429 |
} |
| 430 |
EOF |
430 |
EOF |
| 431 |
if ! $cc $CFLAGS $GTK_CFLAGS $GTK_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then |
431 |
if ! $cc $CFLAGS $GTK_CFLAGS $TMPC -o $TMPE $GTK_LIBS > /dev/null 2>&1; then |
| 432 |
echo "GTK+ 2.0 environment not usable" |
432 |
echo "GTK+ 2.0 environment not usable" |
| 433 |
rm -f $TMPC |
433 |
rm -f $TMPC |
| 434 |
exit 1 |
434 |
exit 1 |
|
Lines 440-451
Link Here
|
| 440 |
if test "$build_player" = "yes"; then |
440 |
if test "$build_player" = "yes"; then |
| 441 |
if $pkgconfig --exists libcurl; then |
441 |
if $pkgconfig --exists libcurl; then |
| 442 |
CURL_CFLAGS=`$pkgconfig --cflags libcurl` |
442 |
CURL_CFLAGS=`$pkgconfig --cflags libcurl` |
| 443 |
CURL_LDFLAGS=`$pkgconfig --libs libcurl` |
443 |
CURL_LIBS=`$pkgconfig --libs libcurl` |
| 444 |
else |
444 |
else |
| 445 |
curlconfig=`which curl-config` |
445 |
curlconfig=`which curl-config` |
| 446 |
if test -n "$curlconfig"; then |
446 |
if test -n "$curlconfig"; then |
| 447 |
CURL_CFLAGS=`$curlconfig --cflags` |
447 |
CURL_CFLAGS=`$curlconfig --cflags` |
| 448 |
CURL_LDFLAGS=`$curlconfig --libs` |
448 |
CURL_LIBS=`$curlconfig --libs` |
| 449 |
else |
449 |
else |
| 450 |
echo "cURL environment not found" |
450 |
echo "cURL environment not found" |
| 451 |
exit 1 |
451 |
exit 1 |
|
Lines 458-464
Link Here
|
| 458 |
return 0; |
458 |
return 0; |
| 459 |
} |
459 |
} |
| 460 |
EOF |
460 |
EOF |
| 461 |
if ! $cc $CFLAGS $CURL_CFLAGS $CURL_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then |
461 |
if ! $cc $CFLAGS $CURL_CFLAGS $TMPC -o $TMPE $CURL_LIBS > /dev/null 2>&1; then |
| 462 |
echo "cURL environment not usable" |
462 |
echo "cURL environment not usable" |
| 463 |
rm -f $TMPC |
463 |
rm -f $TMPC |
| 464 |
exit 1 |
464 |
exit 1 |
|
Lines 686-696
Link Here
|
| 686 |
echo "CXX=$cxx" >> $config_mak |
686 |
echo "CXX=$cxx" >> $config_mak |
| 687 |
echo "CFLAGS=$CFLAGS" >> $config_mak |
687 |
echo "CFLAGS=$CFLAGS" >> $config_mak |
| 688 |
echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak |
688 |
echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak |
| 689 |
echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak |
689 |
echo "GLIB_LIBS=$GLIB_LIBS" >> $config_mak |
| 690 |
echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak |
690 |
echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak |
| 691 |
echo "GTK_LDFLAGS=$GTK_LDFLAGS" >> $config_mak |
691 |
echo "GTK_LIBS=$GTK_LIBS" >> $config_mak |
| 692 |
echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak |
692 |
echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak |
| 693 |
echo "CURL_LDFLAGS=$CURL_LDFLAGS" >> $config_mak |
693 |
echo "CURL_LIBS=$CURL_LIBS" >> $config_mak |
| 694 |
if test "$biarch" = "yes"; then |
694 |
if test "$biarch" = "yes"; then |
| 695 |
echo "LDFLAGS_32=-m32" >> $config_mak |
695 |
echo "LDFLAGS_32=-m32" >> $config_mak |
| 696 |
echo "CFLAGS_32=$CFLAGS_32" >> $config_mak |
696 |
echo "CFLAGS_32=$CFLAGS_32" >> $config_mak |
| 697 |
-- Makefile |
697 |
++ Makefile |
|
Lines 41-46
Link Here
|
| 41 |
STRIP_OPT = -s |
41 |
STRIP_OPT = -s |
| 42 |
endif |
42 |
endif |
| 43 |
|
43 |
|
|
|
44 |
USE_SYSTEM_LIBS = 1 |
| 45 |
|
| 44 |
LN_S = ln -sf |
46 |
LN_S = ln -sf |
| 45 |
|
47 |
|
| 46 |
ifeq ($(LD_soname),) |
48 |
ifeq ($(LD_soname),) |
|
Lines 51-66
Link Here
|
| 51 |
endif |
53 |
endif |
| 52 |
|
54 |
|
| 53 |
ifneq (,$(findstring $(OS),linux)) |
55 |
ifneq (,$(findstring $(OS),linux)) |
| 54 |
libdl_LDFLAGS = -ldl |
56 |
libdl_LIBS = -ldl |
| 55 |
endif |
57 |
endif |
| 56 |
|
58 |
|
| 57 |
libpthread_LDFLAGS = -lpthread |
59 |
libpthread_LIBS = -lpthread |
| 58 |
ifeq ($(OS),dragonfly) |
60 |
ifeq ($(OS),dragonfly) |
| 59 |
libpthread_LDFLAGS = -pthread |
61 |
libpthread_LIBS = -pthread |
| 60 |
endif |
62 |
endif |
| 61 |
|
63 |
|
| 62 |
ifneq (,$(findstring $(OS),solaris)) |
64 |
ifneq (,$(findstring $(OS),solaris)) |
| 63 |
libsocket_LDFLAGS = -lsocket -lnsl |
65 |
libsocket_LIBS = -lsocket -lnsl |
| 64 |
endif |
66 |
endif |
| 65 |
|
67 |
|
| 66 |
PIC_CFLAGS = -fPIC |
68 |
PIC_CFLAGS = -fPIC |
|
Lines 70-77
Link Here
|
| 70 |
DSO_LDFLAGS = -qmkshrobj |
72 |
DSO_LDFLAGS = -qmkshrobj |
| 71 |
endif |
73 |
endif |
| 72 |
|
74 |
|
| 73 |
X_CFLAGS = -I$(x11prefix)/include |
75 |
X_CFLAGS = `pkg-config --cflags xt` |
| 74 |
X_LDFLAGS = -L$(x11prefix)/$(lib64) -lX11 -lXt |
76 |
X_LIBS = `pkg-config --libs xt` |
| 75 |
ifneq (,$(findstring $(OS),netbsd dragonfly)) |
77 |
ifneq (,$(findstring $(OS),netbsd dragonfly)) |
| 76 |
X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64) |
78 |
X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64) |
| 77 |
endif |
79 |
endif |
|
Lines 79-84
Link Here
|
| 79 |
ARCH_32 = $(ARCH) |
81 |
ARCH_32 = $(ARCH) |
| 80 |
ifeq ($(biarch), yes) |
82 |
ifeq ($(biarch), yes) |
| 81 |
ARCH_32 = $(TARGET_ARCH) |
83 |
ARCH_32 = $(TARGET_ARCH) |
|
|
84 |
endif |
| 85 |
|
| 86 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
| 87 |
|
| 88 |
ifeq ($(biarch), yes) |
| 82 |
LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so |
89 |
LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so |
| 83 |
LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so) |
90 |
LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so) |
| 84 |
LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a) |
91 |
LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a) |
|
Lines 92-97
Link Here
|
| 92 |
LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist) |
99 |
LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist) |
| 93 |
LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist) |
100 |
LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist) |
| 94 |
LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist) |
101 |
LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist) |
|
|
102 |
endif |
| 95 |
|
103 |
|
| 96 |
ifeq (i386,$(TARGET_ARCH)) |
104 |
ifeq (i386,$(TARGET_ARCH)) |
| 97 |
TARGET_ELF_ARCH = elf32-i386 |
105 |
TARGET_ELF_ARCH = elf32-i386 |
|
Lines 107-114
Link Here
|
| 107 |
npwrapper_SOURCES = $(npwrapper_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) |
115 |
npwrapper_SOURCES = $(npwrapper_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) |
| 108 |
npwrapper_OBJECTS = $(npwrapper_RAWSRCS:%.c=npwrapper-%.os) |
116 |
npwrapper_OBJECTS = $(npwrapper_RAWSRCS:%.c=npwrapper-%.os) |
| 109 |
npwrapper_CFLAGS = $(CFLAGS) $(X_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS) |
117 |
npwrapper_CFLAGS = $(CFLAGS) $(X_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS) |
| 110 |
npwrapper_LDFLAGS = $(X_LDFLAGS) $(libpthread_LDFLAGS) $(libsocket_LDFLAGS) |
118 |
npwrapper_LIBS = $(X_LIBS) $(libpthread_LIBS) $(libsocket_LIBS) |
| 111 |
npwrapper_LDFLAGS += $(GLIB_LDFLAGS) |
119 |
npwrapper_LIBS += $(GLIB_LIBS) |
|
|
120 |
npwrapper_LDFLAGS += $(LDFLAGS) |
| 112 |
|
121 |
|
| 113 |
npviewer_PROGRAM = npviewer.bin |
122 |
npviewer_PROGRAM = npviewer.bin |
| 114 |
npviewer_RAWSRCS = npw-viewer.c npw-common.c npw-malloc.c npw-rpc.c rpc.c debug.c utils.c npruntime.c |
123 |
npviewer_RAWSRCS = npw-viewer.c npw-common.c npw-malloc.c npw-rpc.c rpc.c debug.c utils.c npruntime.c |
|
Lines 116-132
Link Here
|
| 116 |
npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o) |
125 |
npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o) |
| 117 |
ifeq ($(biarch),yes) |
126 |
ifeq ($(biarch),yes) |
| 118 |
npviewer_CFLAGS = $(CFLAGS_32) |
127 |
npviewer_CFLAGS = $(CFLAGS_32) |
|
|
128 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
| 119 |
npviewer_CFLAGS += -I$(LSB_INC_DIR) |
129 |
npviewer_CFLAGS += -I$(LSB_INC_DIR) |
| 120 |
npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0 |
130 |
npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0 |
| 121 |
npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0 |
131 |
npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0 |
| 122 |
npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) |
132 |
npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) |
| 123 |
npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt |
133 |
else |
|
|
134 |
npviewer_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 glib-2.0) |
| 135 |
npviewer_LDFLAGS = $(LDFLAGS_32) |
| 136 |
endif |
| 137 |
npviewer_LIBS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt |
| 124 |
else |
138 |
else |
| 125 |
npviewer_CFLAGS += $(GTK_CFLAGS) |
139 |
npviewer_CFLAGS += $(GTK_CFLAGS) |
| 126 |
npviewer_LDFLAGS = $(GTK_LDFLAGS) $(X_LDFLAGS) |
140 |
npviewer_LIBS = $(GTK_LIBS) $(X_LIBS) |
| 127 |
endif |
141 |
endif |
| 128 |
npviewer_CFLAGS += $(MOZILLA_CFLAGS) |
142 |
npviewer_CFLAGS += $(MOZILLA_CFLAGS) |
| 129 |
npviewer_LDFLAGS += $(libdl_LDFLAGS) $(libpthread_LDFLAGS) -lgthread-2.0 |
143 |
npviewer_LIBS += $(libdl_LIBS) $(libpthread_LIBS) `pkg-config --libs gthread-2.0` |
| 130 |
ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386) |
144 |
ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386) |
| 131 |
npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map |
145 |
npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map |
| 132 |
endif |
146 |
endif |
|
Lines 137-154
Link Here
|
| 137 |
ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386) |
151 |
ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386) |
| 138 |
npviewer_SOURCES += $(SRC_PATH)/src/cxxabi-compat.cpp |
152 |
npviewer_SOURCES += $(SRC_PATH)/src/cxxabi-compat.cpp |
| 139 |
npviewer_OBJECTS += npviewer-cxxabi-compat.o |
153 |
npviewer_OBJECTS += npviewer-cxxabi-compat.o |
| 140 |
npviewer_LDFLAGS += -lsupc++ |
154 |
npviewer_LIBS += -lsupc++ |
| 141 |
endif |
155 |
endif |
| 142 |
ifeq ($(TARGET_OS):$(TARGET_ARCH),solaris:i386) |
156 |
ifeq ($(TARGET_OS):$(TARGET_ARCH),solaris:i386) |
| 143 |
npviewer_LDFLAGS += $(libsocket_LDFLAGS) |
157 |
npviewer_LIBS += $(libsocket_LIBS) |
| 144 |
endif |
158 |
endif |
| 145 |
|
159 |
|
| 146 |
npplayer_PROGRAM = npplayer |
160 |
npplayer_PROGRAM = npplayer |
| 147 |
npplayer_SOURCES = npw-player.c debug.c rpc.c utils.c glibcurl.c gtk2xtbin.c $(tidy_SOURCES) |
161 |
npplayer_SOURCES = npw-player.c debug.c rpc.c utils.c glibcurl.c gtk2xtbin.c $(tidy_SOURCES) |
| 148 |
npplayer_OBJECTS = $(npplayer_SOURCES:%.c=npplayer-%.o) |
162 |
npplayer_OBJECTS = $(npplayer_SOURCES:%.c=npplayer-%.o) |
| 149 |
npplayer_CFLAGS = $(GTK_CFLAGS) $(MOZILLA_CFLAGS) $(CURL_CFLAGS) $(X_CFLAGS) |
163 |
npplayer_CFLAGS = $(GTK_CFLAGS) $(MOZILLA_CFLAGS) $(CURL_CFLAGS) $(X_CFLAGS) |
| 150 |
npplayer_LDFLAGS = $(GTK_LDFLAGS) $(CURL_LDFLAGS) $(X_LDFLAGS) |
164 |
npplayer_LIBS = $(GTK_LIBS) $(CURL_LIBS) $(X_LIBS) |
| 151 |
npplayer_LDFLAGS += -lgthread-2.0 $(libpthread_LDFLAGS) $(libsocket_LDFLAGS) |
165 |
npplayer_LIBS += `pkg-config --libs gthread-2.0` $(libpthread_LIBS) $(libsocket_LIBS) |
| 152 |
|
166 |
|
| 153 |
libxpcom_LIBRARY = libxpcom.so |
167 |
libxpcom_LIBRARY = libxpcom.so |
| 154 |
libxpcom_RAWSRCS = libxpcom.c debug.c |
168 |
libxpcom_RAWSRCS = libxpcom.c debug.c |
|
Lines 156-163
Link Here
|
| 156 |
libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o) |
170 |
libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o) |
| 157 |
libxpcom_CFLAGS = $(PIC_CFLAGS) |
171 |
libxpcom_CFLAGS = $(PIC_CFLAGS) |
| 158 |
ifeq ($(biarch),yes) |
172 |
ifeq ($(biarch),yes) |
|
|
173 |
libxpcom_LDFLAGS = $(LDFLAGS_32) |
| 174 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
| 159 |
libxpcom_CFLAGS += -I$(LSB_INC_DIR) |
175 |
libxpcom_CFLAGS += -I$(LSB_INC_DIR) |
| 160 |
libxpcom_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) |
176 |
libxpcom_LDFLAGS += -L$(LSB_OBJ_DIR) |
|
|
177 |
endif |
| 161 |
endif |
178 |
endif |
| 162 |
|
179 |
|
| 163 |
libnoxshm_LIBRARY = libnoxshm.so |
180 |
libnoxshm_LIBRARY = libnoxshm.so |
|
Lines 166-186
Link Here
|
| 166 |
libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o) |
183 |
libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o) |
| 167 |
libnoxshm_CFLAGS = $(PIC_CFLAGS) |
184 |
libnoxshm_CFLAGS = $(PIC_CFLAGS) |
| 168 |
ifeq ($(biarch),yes) |
185 |
ifeq ($(biarch),yes) |
|
|
186 |
libnoxshm_LDFLAGS = $(LDFLAGS_32) |
| 187 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
| 169 |
libnoxshm_CFLAGS += -I$(LSB_INC_DIR) |
188 |
libnoxshm_CFLAGS += -I$(LSB_INC_DIR) |
| 170 |
libnoxshm_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) |
189 |
libnoxshm_LDFLAGS += -L$(LSB_OBJ_DIR) |
|
|
190 |
endif |
| 171 |
endif |
191 |
endif |
| 172 |
|
192 |
|
| 173 |
npconfig_PROGRAM = npconfig |
193 |
npconfig_PROGRAM = npconfig |
| 174 |
npconfig_RAWSRCS = npw-config.c |
194 |
npconfig_RAWSRCS = npw-config.c |
| 175 |
npconfig_SOURCES = $(npconfig_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) |
195 |
npconfig_SOURCES = $(npconfig_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) |
| 176 |
npconfig_OBJECTS = $(npconfig_RAWSRCS:%.c=npconfig-%.o) |
196 |
npconfig_OBJECTS = $(npconfig_RAWSRCS:%.c=npconfig-%.o) |
| 177 |
npconfig_LDFLAGS = $(libdl_LDFLAGS) |
197 |
npconfig_LIBS = $(libdl_LIBS) |
| 178 |
ifneq (,$(findstring $(OS),netbsd dragonfly)) |
198 |
ifneq (,$(findstring $(OS),netbsd dragonfly)) |
| 179 |
# We will try to dlopen() the native plugin library. If that lib is |
199 |
# We will try to dlopen() the native plugin library. If that lib is |
| 180 |
# linked against libpthread, then so must our program too. |
200 |
# linked against libpthread, then so must our program too. |
| 181 |
# XXX use the ELF decoder for native plugins too? |
201 |
# XXX use the ELF decoder for native plugins too? |
| 182 |
npconfig_LDFLAGS += $(libpthread_LDFLAGS) |
202 |
npconfig_LIBS += $(libpthread_LIBS) |
| 183 |
endif |
203 |
endif |
|
|
204 |
npconfig_LDFLAGS += $(LDFLAGS) |
| 184 |
|
205 |
|
| 185 |
nploader_PROGRAM = npviewer |
206 |
nploader_PROGRAM = npviewer |
| 186 |
nploader_RAWSRCS = npw-viewer.sh |
207 |
nploader_RAWSRCS = npw-viewer.sh |
|
Lines 192-198
Link Here
|
| 192 |
test_rpc_client_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_CLIENT -DNPW_COMPONENT_NAME="\"Client\"" |
213 |
test_rpc_client_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_CLIENT -DNPW_COMPONENT_NAME="\"Client\"" |
| 193 |
test_rpc_server_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_SERVER -DNPW_COMPONENT_NAME="\"Server\"" |
214 |
test_rpc_server_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_SERVER -DNPW_COMPONENT_NAME="\"Server\"" |
| 194 |
test_rpc_CFLAGS = -I$(SRC_PATH)/src $(GLIB_CFLAGS) |
215 |
test_rpc_CFLAGS = -I$(SRC_PATH)/src $(GLIB_CFLAGS) |
| 195 |
test_rpc_LDFLAGS = $(GLIB_LDFLAGS) $(libpthread_LDFLAGS) $(libsocket_LDFLAGS) |
216 |
test_rpc_LIBS = $(GLIB_LIBS) $(libpthread_LIBS) $(libsocket_LIBS) |
| 196 |
test_rpc_RAWPROGS = \ |
217 |
test_rpc_RAWPROGS = \ |
| 197 |
test-rpc-types \ |
218 |
test-rpc-types \ |
| 198 |
test-rpc-nested-1 \ |
219 |
test-rpc-nested-1 \ |
|
Lines 230-235
Link Here
|
| 230 |
FILES += $(wildcard tests/*.html) |
251 |
FILES += $(wildcard tests/*.html) |
| 231 |
FILES += $(wildcard tests/*.c tests/*.h) |
252 |
FILES += $(wildcard tests/*.c tests/*.h) |
| 232 |
FILES += $(wildcard npapi/*.h npapi/nspr/*.h npapi/nspr/obsolete/*.h) |
253 |
FILES += $(wildcard npapi/*.h npapi/nspr/*.h npapi/nspr/obsolete/*.h) |
|
|
254 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
| 233 |
FILES += $(LSB_TOP_DIR)/headers/core_filelist |
255 |
FILES += $(LSB_TOP_DIR)/headers/core_filelist |
| 234 |
FILES += $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist)) |
256 |
FILES += $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist)) |
| 235 |
FILES += $(LSB_TOP_DIR)/headers/desktop_filelist |
257 |
FILES += $(LSB_TOP_DIR)/headers/desktop_filelist |
|
Lines 243-254
Link Here
|
| 243 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS)) |
265 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS)) |
| 244 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS)) |
266 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS)) |
| 245 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS)) |
267 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS)) |
|
|
268 |
endif |
| 246 |
|
269 |
|
| 247 |
all: $(TARGETS) |
270 |
all: $(TARGETS) |
| 248 |
|
271 |
|
| 249 |
clean: |
272 |
clean: |
| 250 |
rm -f $(TARGETS) *.o *.os |
273 |
rm -f $(TARGETS) *.o *.os |
|
|
274 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
| 251 |
rm -rf $(LSB_OBJ_DIR) |
275 |
rm -rf $(LSB_OBJ_DIR) |
|
|
276 |
endif |
| 252 |
|
277 |
|
| 253 |
distclean: clean |
278 |
distclean: clean |
| 254 |
rm -f config-host.* config.* |
279 |
rm -f config-host.* config.* |
|
Lines 372-384
Link Here
|
| 372 |
svn commit -m "Generated by svn2cl." ChangeLog |
397 |
svn commit -m "Generated by svn2cl." ChangeLog |
| 373 |
|
398 |
|
| 374 |
$(npwrapper_LIBRARY): $(npwrapper_OBJECTS) |
399 |
$(npwrapper_LIBRARY): $(npwrapper_OBJECTS) |
| 375 |
$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) |
400 |
$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LIBS) |
| 376 |
|
401 |
|
| 377 |
npwrapper-%.os: $(SRC_PATH)/src/%.c |
402 |
npwrapper-%.os: $(SRC_PATH)/src/%.c |
| 378 |
$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER |
403 |
$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER |
| 379 |
|
404 |
|
| 380 |
$(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) |
405 |
$(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) |
| 381 |
$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) |
406 |
$(CC) $(LDFLAGS_32) -o $@ $(npviewer_LDFLAGS) $(npviewer_OBJECTS) $(npviewer_LIBS) |
| 382 |
|
407 |
|
| 383 |
npviewer-%.o: $(SRC_PATH)/src/%.c |
408 |
npviewer-%.o: $(SRC_PATH)/src/%.c |
| 384 |
$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER |
409 |
$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER |
|
Lines 387-393
Link Here
|
| 387 |
$(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER |
412 |
$(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER |
| 388 |
|
413 |
|
| 389 |
$(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) |
414 |
$(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) |
| 390 |
$(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS) |
415 |
$(CC) $(LDFLAGS) $(npplayer_LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LIBS) |
| 391 |
|
416 |
|
| 392 |
npplayer-%.o: $(SRC_PATH)/src/%.c |
417 |
npplayer-%.o: $(SRC_PATH)/src/%.c |
| 393 |
$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER |
418 |
$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER |
|
Lines 395-413
Link Here
|
| 395 |
$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER |
420 |
$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER |
| 396 |
|
421 |
|
| 397 |
$(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) |
422 |
$(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) |
| 398 |
$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so |
423 |
$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) $(libxpcom_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LIBS) -Wl,$(LD_soname),libxpcom.so |
| 399 |
|
424 |
|
| 400 |
libxpcom-%.o: $(SRC_PATH)/src/%.c |
425 |
libxpcom-%.o: $(SRC_PATH)/src/%.c |
| 401 |
$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM |
426 |
$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM |
| 402 |
|
427 |
|
| 403 |
$(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) |
428 |
$(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) |
| 404 |
$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so |
429 |
$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) $(libnoxshm_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LIBS) -Wl,$(LD_soname),libnoxshm.so |
| 405 |
|
430 |
|
| 406 |
libnoxshm-%.o: $(SRC_PATH)/src/%.c |
431 |
libnoxshm-%.o: $(SRC_PATH)/src/%.c |
| 407 |
$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS) |
432 |
$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS) |
| 408 |
|
433 |
|
| 409 |
$(npconfig_PROGRAM): $(npconfig_OBJECTS) |
434 |
$(npconfig_PROGRAM): $(npconfig_OBJECTS) |
| 410 |
$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) |
435 |
$(CC) $(npconfig_LDFLAGS) -o $@ $(npconfig_OBJECTS) $(npconfig_LIBS) |
| 411 |
|
436 |
|
| 412 |
npconfig-%.o: $(SRC_PATH)/src/%.c |
437 |
npconfig-%.o: $(SRC_PATH)/src/%.c |
| 413 |
$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) |
438 |
$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) |
|
Lines 438-450
Link Here
|
| 438 |
-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '` |
463 |
-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '` |
| 439 |
|
464 |
|
| 440 |
test-rpc-%-client: test-rpc-%-client.o $(test_rpc_client_OBJECTS) |
465 |
test-rpc-%-client: test-rpc-%-client.o $(test_rpc_client_OBJECTS) |
| 441 |
$(CC) -o $@ $< $(test_rpc_client_OBJECTS) $(test_rpc_LDFLAGS) |
466 |
$(CC) $(test_rpc_LDFLAGS) -o $@ $< $(test_rpc_client_OBJECTS) $(test_rpc_LIBS) |
| 442 |
test-rpc-%-client.o: $(SRC_PATH)/tests/test-rpc-%.c |
467 |
test-rpc-%-client.o: $(SRC_PATH)/tests/test-rpc-%.c |
| 443 |
$(CC) -o $@ -c $< $(test_rpc_client_CPPFLAGS) $(test_rpc_CFLAGS) |
468 |
$(CC) -o $@ -c $< $(test_rpc_client_CPPFLAGS) $(test_rpc_CFLAGS) |
| 444 |
%-client.o: $(SRC_PATH)/src/%.c |
469 |
%-client.o: $(SRC_PATH)/src/%.c |
| 445 |
$(CC) -o $@ -c $< $(test_rpc_client_CPPFLAGS) $(test_rpc_CFLAGS) |
470 |
$(CC) -o $@ -c $< $(test_rpc_client_CPPFLAGS) $(test_rpc_CFLAGS) |
| 446 |
test-rpc-%-server: test-rpc-%-server.o $(test_rpc_server_OBJECTS) |
471 |
test-rpc-%-server: test-rpc-%-server.o $(test_rpc_server_OBJECTS) |
| 447 |
$(CC) -o $@ $< $(test_rpc_server_OBJECTS) $(test_rpc_LDFLAGS) |
472 |
$(CC) $(test_rpc_LDFLAGS) -o $@ $< $(test_rpc_server_OBJECTS) $(test_rpc_LIBS) |
| 448 |
test-rpc-%-server.o: $(SRC_PATH)/tests/test-rpc-%.c |
473 |
test-rpc-%-server.o: $(SRC_PATH)/tests/test-rpc-%.c |
| 449 |
$(CC) -o $@ -c $< $(test_rpc_server_CPPFLAGS) $(test_rpc_CFLAGS) |
474 |
$(CC) -o $@ -c $< $(test_rpc_server_CPPFLAGS) $(test_rpc_CFLAGS) |
| 450 |
%-server.o: $(SRC_PATH)/src/%.c |
475 |
%-server.o: $(SRC_PATH)/src/%.c |
