[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Simulavr-devel] joel's attempt at the why I hate autotools. :-D
From: |
Joel Sherrill |
Subject: |
[Simulavr-devel] joel's attempt at the why I hate autotools. :-D |
Date: |
Wed, 8 Jul 2009 13:34:35 -0500 |
User-agent: |
Thunderbird 2.0.0.21 (X11/20090320) |
Hi,
Sorry if this shows up multiple times. The first
attempt was soundly rejected.
Just wanted to pass on that I applied the part of
your diff which touched examples/Makefile.am and
src/Makefile.am.
I then copied /dev/null to the files added to
src/Makefile.am so I could build like you would.
Built fine for me after a bootstrap on Fedora 10.
I hope this helps some. :)
--joel
? src/atmega168.h
? src/atmega668.cpp
? src/atmega668.h
? src/atmega88.h
Index: examples/Makefile.am
===================================================================
RCS file: /sources/simulavr/simulavrxx/examples/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- examples/Makefile.am 8 May 2009 20:30:02 -0000 1.14
+++ examples/Makefile.am 8 Jul 2009 18:34:01 -0000
@@ -10,11 +10,11 @@
noinst_DATA = kbd.xbm
-CLEANFILES = $(builddir)/kbd.xbm
+#CLEANFILES = $(builddir)/kbd.xbm
all-local: $(builddir)/kbd.xbm
$(builddir)/kbd.xbm: $(srcdir)/kbd.xbm
- test -r $(builddir)/kbd.xbm || cp $(srcdir)/kbd.xbm $(builddir)/kbd.xbm
+ -test -r $(builddir)/kbd.xbm || cp $(srcdir)/kbd.xbm $(builddir)/kbd.xbm
EXTRA_DIST = kbd.xbm
Index: src/Makefile.am
===================================================================
RCS file: /sources/simulavr/simulavrxx/src/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- src/Makefile.am 22 May 2009 20:24:16 -0000 1.38
+++ src/Makefile.am 8 Jul 2009 18:34:02 -0000
@@ -29,6 +29,7 @@
libsim_la_SOURCES = \
adcpin.cpp application.cpp at4433.cpp at8515.cpp atmega48.cpp atmega128.cpp \
+ atmega668.cpp \
avrdevice.cpp avrerror.cpp avrfactory.cpp avrmalloc.cpp decoder.cpp \
decoder_trace.cpp flash.cpp gdbserver.cpp hardware.cpp helper.cpp \
hwacomp.cpp hwad.cpp hweeprom.cpp hwextirq.cpp hwmega48extirq.cpp \
@@ -41,12 +42,13 @@
string2.cpp systemclock.cpp trace.cpp ui.cpp
nodist_libsimulavr_la_SOURCES = $(TCL_WRAP_SRC)
-libsimulavr_la_LDFLAGS = -version-info 0:0:0
-libsimulavr_la_LIBADD = $(libsim_la_OBJECTS) -lz \
- $(AVR_LIBBFD_LIB) $(AVR_LIBIBERTY_LIB)
+
+libsimulavr_la_LDFLAGS = -version-info 0:0:0 -rpath ${prefix}/lib
+libsimulavr_la_LIBADD = $(libsim_la_OBJECTS) -lz -lbfd $(AVR_LIBIBERTY_LIB)
pkginclude_HEADERS = \
adcpin.h application.h at4433.h at8515.h atmega48.h atmega128.h avrdevice.h \
+ atmega668.h atmega88.h atmega168.h \
avrdevice_impl.h avrerror.h avrfactory.h avrmalloc.h breakpoint.h \
config_deprecated.h decoder.h externaltype.h flash.h \
funktor.h hwacomp.h hwad.h hweeprom.h hwextirq.h hwmega48extirq.h \
@@ -61,7 +63,8 @@
simulavr_SOURCES = main.cpp $(COMMON_SRC)
-simulavr_LDADD = $(libsim_la_OBJECTS) $(AVR_LIBBFD_LIB) -lz
$(AVR_LIBIBERTY_LIB)
+simulavr_LDADD = libsimulavr.la -lbfd \
+ -lz $(TCL_LIB) $(AVR_LIBIBERTY_LIB)
TCLHEADER = avrdevice.h at8515.h atmega128.h at4433.h gdb.h hardware.h \
keyboard.h lcd.h net.h pin.h keyboard.h rwmem.h scope.h serialrx.h \
@@ -86,12 +89,12 @@
@MAINT@ $(builddir)/kbdgentables $(srcdir)
# Python bindings
-_pysimulavr.so: pysimulavr_wrap.cpp simulavr
- $(CXX) -I$(srcdir) $(PYTHON_CPPFLAGS) $< \
- $(patsubst %.lo,%.o,$(libsimulavr_la_OBJECTS)) \
- $(AVR_LIBBFD_LIB) $(LIBIBERTY) -lc -lm -lncurses -shared \
+_pysimulavr.so: pysimulavr_wrap.cpp simulavr $(libsim_la_OBJECTS)
$(libsim_la_DEPENDENCIES)
+ $(CXXLINK) -I$(srcdir) $(PYTHON_CPPFLAGS) -fPIC -shared $< \
+ $(libsim_la_OBJECTS) $(libsim_la_LIBADD) $(LIBS) \
+ -lbfd $(LIBIBERTY) -lc -lm -lncurses \
-o $@ $(NonPortableDarwin_GXX_Flags)
-
+
pysimulavr_wrap.cpp: $(srcdir)/pysimulavr.i
$(SWIG) $(SWIG_PYTHON_OPT) $(PYTHON_CPPFLAGS) -o $@ $?
- [Simulavr-devel] joel's attempt at the why I hate autotools. :-D,
Joel Sherrill <=