Changes in uspace/Makefile.common [2f9a8e8:1dcc0b9] in mainline

File:

• uspace/Makefile.common (modified) (8 diffs)

uspace/Makefile.common

@@ -142 +142 @@
 LIBHOUND_PREFIX = $(LIB_PREFIX)/hound
 LIBPCM_PREFIX = $(LIB_PREFIX)/pcm
+LIBNET_PREFIX = $(LIB_PREFIX)/net
 LIBNIC_PREFIX = $(LIB_PREFIX)/nic
 LIBIEEE80211_PREFIX = $(LIB_PREFIX)/ieee80211
@@ -157 +158 @@
 LIBMBR_PREFIX = $(LIB_PREFIX)/mbr
 LIBGPT_PREFIX = $(LIB_PREFIX)/gpt
-LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
 
 LIBURCU_PREFIX = $(LIB_PREFIX)/urcu
@@ -249 +249 @@
 # something won't break because of that:
 # -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) -finput-charset=UTF-8
-CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+CLANG_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
-        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -integrated-as -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
+        -Werror-implicit-function-declaration -Wwrite-strings \
+        -integrated-as \
+        -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
 
 LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
@@ -264 +265 @@
 
 ifeq ($(CONFIG_LINE_DEBUG),y)
-        GCC_CFLAGS += -ggdb
+        GCC_CFLAGS += -g
         ICC_CFLAGS += -g
         CLANG_CFLAGS += -g
@@ -291 +292 @@
 
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS += $(GCC_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_helenos)
-        CFLAGS += $(GCC_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_native)
-        CFLAGS += $(GCC_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),icc)
-        CFLAGS += $(ICC_CFLAGS)
+        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),clang)
-        CFLAGS += $(CLANG_CFLAGS)
+        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        GCC_CFLAGS += $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
@@ -373 +375 @@
 
 %.o: %.S $(DEPEND)
-        $(GCC) $(DEFS) $(GCC_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
 endif
 
@@ -385 +387 @@
 
 %.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
+        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
 endif
 
 %.test.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
+        $(CC) $(DEFS) $(CFLAGS) $(TEST_CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
 endif
 
 %.lo: %.S $(DEPEND)
-        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
+        $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
 endif
 
@@ -409 +411 @@
 
 %.lo: %.c $(DEPEND)
-        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
+        $(CC) $(DEFS) $(LIB_CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
 endif
 
 $(DEPEND): $(PRE_DEPEND)
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@