Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 177222
Collapse All | Expand All

(-)configure.old (-17 / +25 lines)
Lines 58-64 echo "BITS = " $BITS >> config.h Link Here
58
echo  " [*] Enabling readline support"
58
echo  " [*] Enabling readline support"
59
READLN="1"
59
READLN="1"
60
echo  "READLNOPT	= -DUSE_READLN"		>> config.h
60
echo  "READLNOPT	= -DUSE_READLN"		>> config.h
61
echo  "LDREADLNOPT	= -lreadline -ltermcap" >> config.h
61
echo  "LDREADLNOPT	= -lreadline" >> config.h
62
;;
62
;;
63
63
64
--enable-static*)
64
--enable-static*)
Lines 148-154 fi Link Here
148
# Set default variables in case it was not precised
148
# Set default variables in case it was not precised
149
149
150
if [ "$MODPATHSET" != "1" ]; then
150
if [ "$MODPATHSET" != "1" ]; then
151
    echo "#define ELFSH_MODPATH    \"/usr/share/elfsh/\"" 	>> vars.h
151
    echo "#define ELFSH_MODPATH    \"/usr/lib/elfsh/\"" 	>> vars.h
152
fi
152
fi
153
153
154
if [ "$SHELLSET" != "1" ]; then
154
if [ "$SHELLSET" != "1" ]; then
Lines 160-166 if [ "$BUILDOP" != "1" ]; then Link Here
160
fi
160
fi
161
161
162
echo  " [*] Enabling libasm support"
162
echo  " [*] Enabling libasm support"
163
echo  "LDASMOPT	= -lasm"		>> config.h
163
echo  "LDASMOPT	= -lasmelfsh"		>> config.h
164
164
165
165
166
# Now do the OS dependant configuration
166
# Now do the OS dependant configuration
Lines 225-239 echo "" >> Makefile Link Here
225
echo ""								>> Makefile
225
echo ""								>> Makefile
226
echo "include ./config.h "					>> Makefile
226
echo "include ./config.h "					>> Makefile
227
echo " "							>> Makefile
227
echo " "							>> Makefile
228
echo "DESTDIR = /"						>> Makefile
228
echo "RM      = rm -f "						>> Makefile
229
echo "RM      = rm -f "						>> Makefile
229
echo "ETAGS   = etags "					        >> Makefile
230
echo "ETAGS   = etags "					        >> Makefile
230
echo "CTAGS   = ctags "						>> Makefile
231
echo "CTAGS   = ctags "						>> Makefile
231
echo "BASEPATH = \$(DESTDIR)/usr"				>> Makefile
232
echo "BASEPATH = \$(DESTDIR)/usr"				>> Makefile
232
echo "MODPATH = \$(BASEPATH)/share/elfsh/"			>> Makefile
233
echo "BINPATH = \$(BASEPATH)/bin"				>> Makefile
233
echo "BINPATH = \$(BASEPATH)/bin/"				>> Makefile
234
echo "LIBPATH = \$(BASEPATH)/lib"				>> Makefile
234
echo "LIBPATH = \$(BASEPATH)/lib/"				>> Makefile
235
echo "INCPATH = \$(BASEPATH)/include"				>> Makefile
235
echo "INCPATH = \$(BASEPATH)/include/"				>> Makefile
236
echo "MANPATH = \$(BASEPATH)/share/man"				>> Makefile
236
echo "MANPATH = \$(BASEPATH)/share/man"				>> Makefile
237
echo "MODPATH = \$(LIBPATH)/elfsh"				>> Makefile
237
238
238
echo " "							>> Makefile
239
echo " "							>> Makefile
239
echo "all     : world final modules tags"			>> Makefile
240
echo "all     : world final modules tags"			>> Makefile
Lines 271-292 echo " @echo 'ELFsh modules suite built Link Here
271
echo " "							>> Makefile
272
echo " "							>> Makefile
272
273
273
echo "install : mod_install "					>> Makefile
274
echo "install : mod_install "					>> Makefile
275
echo "	@mkdir -p \$(BINPATH) \$(LIBPATH) \$(INCPATH)"		>> Makefile
274
echo "	@cp vm/elfsh \$(BINPATH)/ "				>> Makefile
276
echo "	@cp vm/elfsh \$(BINPATH)/ "				>> Makefile
277
echo "	@cp vm/e2dbg.so \$(LIBPATH)/ "				>> Makefile
275
echo "	@cp libelfsh/libelfsh.a libelfsh/libelfsh.so \$(LIBPATH) " >> Makefile
278
echo "	@cp libelfsh/libelfsh.a libelfsh/libelfsh.so \$(LIBPATH) " >> Makefile
276
echo "	@cp libasm/libasm.a \$(LIBPATH) "			>> Makefile
279
echo "	@cp libasm/libasmelfsh.a \$(LIBPATH) "			>> Makefile
280
echo "	@cp libhash/libhashelfsh.a \$(LIBPATH) "		>> Makefile
277
echo "	@cp -R libelfsh/include/* \$(INCPATH) "			>> Makefile
281
echo "	@cp -R libelfsh/include/* \$(INCPATH) "			>> Makefile
282
echo "	@cp libhash/include/libhash.h \$(INCPATH)"		>> Makefile
278
echo "	@cp libasm/include/libasm.h \$(INCPATH)"		>> Makefile
283
echo "	@cp libasm/include/libasm.h \$(INCPATH)"		>> Makefile
279
echo "	@cp libasm/include/libasm-i386.h \$(INCPATH) "		>> Makefile
284
echo "	@cp libasm/include/libasm-i386.h \$(INCPATH) "		>> Makefile
285
echo "	@mkdir -p \$(MANPATH)/man1 "			>> Makefile
280
echo "	@cp doc/elfsh.1 \$(MANPATH)/man1/ "			>> Makefile
286
echo "	@cp doc/elfsh.1 \$(MANPATH)/man1/ "			>> Makefile
281
echo "	@chmod 755 \$(MANPATH)/man1/elfsh.1 "			>> Makefile
287
echo "	@chmod 755 \$(MANPATH)/man1/elfsh.1 "			>> Makefile
282
echo "	@chmod 755 \$(BINPATH)/elfsh "				>> Makefile
288
echo "	@chmod 755 \$(BINPATH)/elfsh "				>> Makefile
283
echo "	@chmod 755 \$(LIBPATH)libelfsh.so "			>> Makefile
289
echo "	@chmod 755 \$(LIBPATH)/libelfsh.so "			>> Makefile
284
echo "	@chmod 755 \$(LIBPATH)e2dbg.so "			>> Makefile
290
echo "	@chmod 755 \$(LIBPATH)/e2dbg.so "			>> Makefile
285
echo "	@chmod 755 \$(INCPATH)libelfsh*.h "			>> Makefile
291
echo "	@chmod 755 \$(INCPATH)/libelfsh*.h "			>> Makefile
286
echo "	@chmod 755 \$(LIBPATH)libelfsh.a "			>> Makefile
292
echo "	@chmod 755 \$(LIBPATH)/libelfsh.a "			>> Makefile
287
echo "	@chmod 755 \$(LIBPATH)libasm.a "			>> Makefile
293
echo "	@chmod 755 \$(LIBPATH)/libasmelfsh.a "			>> Makefile
288
echo "	@chmod 755 \$(INCPATH)libelfsh*.h "			>> Makefile
294
echo "	@chmod 755 \$(LIBPATH)/libhashelfsh.a "			>> Makefile
289
echo "	@chmod 755 \$(INCPATH)libasm*.h "			>> Makefile
295
echo "	@chmod 755 \$(INCPATH)/libelfsh*.h "			>> Makefile
296
echo "	@chmod 755 \$(INCPATH)/libasm*.h "			>> Makefile
297
echo "	@chmod 755 \$(INCPATH)/libhash*.h "			>> Makefile
290
echo "	@echo 'ELFsh, Libelfsh, and Libasm installed successfully .'"	>> Makefile
298
echo "	@echo 'ELFsh, Libelfsh, and Libasm installed successfully .'"	>> Makefile
291
echo " "							>> Makefile 
299
echo " "							>> Makefile 
292
300
Lines 306-313 echo " @echo 'ELFsh ET_DYN has been buil Link Here
306
echo " "							>> Makefile
314
echo " "							>> Makefile
307
315
308
echo "mod_install: "						>> Makefile
316
echo "mod_install: "						>> Makefile
309
echo "	@mkdir \$(MODPATH) 2>/dev/null || true "		>> Makefile
317
echo "	@mkdir -p \$(MODPATH) "					>> Makefile
310
echo "	@cp modules/*.so \$(MODPATH) "				>> Makefile
318
echo "	@cp modules/*.so \$(MODPATH) 2>/dev/null || true "	>> Makefile
311
echo "	@chmod -R 755 \$(MODPATH) "				>> Makefile
319
echo "	@chmod -R 755 \$(MODPATH) "				>> Makefile
312
echo " "							>> Makefile
320
echo " "							>> Makefile
313
321
(-)libelfsh/include/libelfsh.h.old (-1 / +1 lines)
Lines 8-14 Link Here
8
#ifndef __LIBELFSH_H_
8
#ifndef __LIBELFSH_H_
9
 #define __LIBELFSH_H_
9
 #define __LIBELFSH_H_
10
10
11
#include "../../libvars.h"
11
//#include "../../libvars.h"
12
12
13
#include <stdlib.h>
13
#include <stdlib.h>
14
#include <stdio.h>
14
#include <stdio.h>
(-)libasm/Makefile.old (-6 / +6 lines)
Lines 46-52 SRCS_libasm = src/arch/ia32/i386-0.c \ Link Here
46
46
47
OBJS_libasm =	${SRCS_libasm:.c=.o}
47
OBJS_libasm =	${SRCS_libasm:.c=.o}
48
48
49
NAME_libasm = libasm.a
49
NAME_libasm = libasmelfsh.a
50
50
51
#
51
#
52
# debug source files
52
# debug source files
Lines 60-66 CFLAGS = -Iinclude Link Here
60
60
61
RM = rm -f
61
RM = rm -f
62
62
63
LDFLAGS = -L. -lasm
63
LDFLAGS = -L. -lasmelfsh
64
64
65
ETAGS = etags
65
ETAGS = etags
66
66
Lines 72-85 mydisasm: ${OBJS_mydisasm} Link Here
72
	$(CC) -o mydisasm ${OBJS_mydisasm} ${LDFLAGS} -lelfsh
72
	$(CC) -o mydisasm ${OBJS_mydisasm} ${LDFLAGS} -lelfsh
73
73
74
install:
74
install:
75
	cp libasm.a /usr/lib
75
	cp libasmelfsh.a /usr/lib
76
	cp include/libasm.h /usr/include
76
	cp include/libasm.h /usr/include
77
	cp include/libasm-i386.h /usr/include
77
	cp include/libasm-i386.h /usr/include
78
78
79
lib:	$(OBJS_libasm)
79
lib:	$(OBJS_libasm)
80
	@echo Building library.
80
	@echo Building library.
81
	@ar rc libasm.a ${OBJS_libasm}
81
	@ar rc libasmelfsh.a ${OBJS_libasm}
82
	@ranlib libasm.a
82
	@ranlib libasmelfsh.a
83
83
84
clean:
84
clean:
85
	@echo Cleaning sources tree.
85
	@echo Cleaning sources tree.
Lines 88-94 clean: Link Here
88
88
89
fclean: clean
89
fclean: clean
90
	@echo Removing builds.
90
	@echo Removing builds.
91
	@$(RM) mydisasm libasm.a 
91
	@$(RM) mydisasm libasmelfsh.a 
92
tags:
92
tags:
93
	@$(ETAGS) -a arch/i386/*.c include/*.h engine/*.c sample/*.c
93
	@$(ETAGS) -a arch/i386/*.c include/*.h engine/*.c sample/*.c
94
	@echo TAGS generated succesfully
94
	@echo TAGS generated succesfully
(-)vm/Makefile.old (-1 / +1 lines)
Lines 38-44 CFLAGS = -fPIC -g3 -Wall -Iinclude $(D Link Here
38
			$(BITS)
38
			$(BITS)
39
39
40
LDFLAGS			= -L../libelfsh/ -lelfsh -L../libhash/ -lhashelfsh \
40
LDFLAGS			= -L../libelfsh/ -lelfsh -L../libhash/ -lhashelfsh \
41
			  -L../libdump/ -L/usr/pkg/lib/ -L../libasm/ -lasm \
41
			  -L../libdump/ -L/usr/pkg/lib/ -L../libasm/ -lasmelfsh \
42
			-g3 $(LDASMOPT) $(LDREADLNOPT) $(DLOPT) $(DYNOPT) \
42
			-g3 $(LDASMOPT) $(LDREADLNOPT) $(DLOPT) $(DYNOPT) \
43
			$(BITS) $(EXTRAOPT) $(LDDUMPOPT)
43
			$(BITS) $(EXTRAOPT) $(LDDUMPOPT)
44
44

Return to bug 177222