Removed stuff that was already in cpu/native/Makefile.native, and included it

This commit is contained in:
adamdunkels 2007-03-29 22:23:31 +00:00
parent a8b3ec1a3b
commit 9da9650ff5

View file

@ -7,7 +7,9 @@ endif
CONTIKI_TARGET_DIRS = . net CONTIKI_TARGET_DIRS = . net
CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o} CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}
CONTIKI_TARGET_SOURCEFILES = contiki-main.c dlloader.c clock.c leds.c leds-arch.c CONTIKI_TARGET_SOURCEFILES = contiki-main.c dlloader.c clock.c \
leds.c leds-arch.c
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
CONTIKI_TARGET_SOURCEFILES += wpcap-service.c wpcap.c CONTIKI_TARGET_SOURCEFILES += wpcap-service.c wpcap.c
else else
@ -16,28 +18,16 @@ endif
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES) CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
.SUFFIXES:
### Define the CPU directory
CONTIKI_CPU=$(CONTIKI)/cpu/x86
### Compiler definitions
CC = gcc
LD = gcc
AS = as
OBJCOPY = objcopy
STRIP = strip
CFLAGSNO = -I. -I$(CONTIKI)/core -I$(CONTIKI_CPU) \
-I$(CONTIKI)/platform/$(TARGET) \
${addprefix -I,$(APPDIRS)} $(APP_INCLUDES) \
-DWITH_UIP -DWITH_ASCII \
-Wall -g -I. -I/usr/local/include
CFLAGS += $(CFLAGSNO)
LDFLAGS = -Wl,-Map=contiki.map,-export-dynamic
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
TARGET_LIBFILES = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a TARGET_LIBFILES = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a
endif endif
.SUFFIXES:
### Define the CPU directory
CONTIKI_CPU=$(CONTIKI)/cpu/native
include $(CONTIKI)/cpu/native/Makefile.native
### Setup directory search path for source files ### Setup directory search path for source files
CONTIKI_TARGET_DIRS_CONCAT = ${addprefix $(CONTIKI)/platform/$(TARGET)/, \ CONTIKI_TARGET_DIRS_CONCAT = ${addprefix $(CONTIKI)/platform/$(TARGET)/, \
@ -45,21 +35,3 @@ CONTIKI_TARGET_DIRS_CONCAT = ${addprefix $(CONTIKI)/platform/$(TARGET)/, \
vpath %.c $(PROJECTDIRS) \ vpath %.c $(PROJECTDIRS) \
$(CONTIKIDIRS) $(APPDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \ $(CONTIKIDIRS) $(APPDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \
$(CONTIKI_CPU) $(APP_DIRS) $(CONTIKI_CPU) $(APP_DIRS)
### Compilation rules
# $(OBJECTDIR)/%.o: %.c
# $(CC) $(CFLAGS) -c $< -o $@
%.so: $(OBJECTDIR)/%.o
$(LD) -shared -o $@ $^
# %.ce: %.co
# $(LD) -shared -o $@ $^
# %.co: %.c
# $(CC) $(CFLAGS) -DPROCESS_LOADABLE -c $< -o $@
# $(STRIP) --strip-unneeded -g -x $@
# %: %.co $(CONTIKI_TARGET_MAIN) $(PROJECT_OBJECTFILES) contiki-$(TARGET).a
# $(CC) $(CFLAGS) -o $@.$(TARGET) $^ $(LDFLAGS)