Changeset c5c003c in mainline

Timestamp:

2011-01-28T10:45:15Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7a51d75, ea6a824

Parents:

679a135

Message:

Cleaner Makefile

Also updated ignore list.

Files:

• .bzrignore (modified) (1 diff)
• uspace/app/virtusbhub/Makefile (modified) (2 diffs)
• uspace/app/virtusbhub/main.c (modified) (1 diff)

.bzrignore

@@ -67 +67 @@
 ./uspace/app/usbinfo/usbinfo
 ./uspace/app/virtusbkbd/vuk
+./uspace/app/virtusbhub/vuh
+./uspace/app/virtusbhub/vhc_hub/*
 ./uspace/app/websrv/websrv
 ./uspace/dist/app/*

uspace/app/virtusbhub/Makefile

@@ -42 +42 @@
 
 STOLEN_VHC_SOURCES = \
-        hub.c \
-        virthub.c \
-        virthubops.c 
+        vhc_hub/hub.c \
+        vhc_hub/virthub.c \
+        vhc_hub/virthubops.c 
 STOLEN_VHC_HEADERS = \
-        hub.h \
-        virthub.h
+        vhc_hub/hub.h \
+        vhc_hub/virthub.h
 
 PRE_DEPEND = $(STOLEN_VHC_SOURCES) $(STOLEN_VHC_HEADERS)
@@ -57 +57 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-
-hub.h: $(HUB_IN_VHC)/hub.h
-        ln -sfn $(HUB_IN_VHC)/$@ $@
-
-hub.c: $(HUB_IN_VHC)/hub.c
-        ln -sfn $(HUB_IN_VHC)/$@ $@
-
-virthub.h: $(HUB_IN_VHC)/virthub.h
-        ln -sfn $(HUB_IN_VHC)/$@ $@
-
-virthub.c: $(HUB_IN_VHC)/virthub.c
-        ln -sfn $(HUB_IN_VHC)/$@ $@
-
-virthubops.c: $(HUB_IN_VHC)/virthubops.c
-        ln -sfn $(HUB_IN_VHC)/$@ $@
+vhc_hub/%.h: $(HUB_IN_VHC)/%.h
+        ln -sfn ../$(HUB_IN_VHC)/$*.h $@
+vhc_hub/%.c: $(HUB_IN_VHC)/%.c
+        ln -sfn ../$(HUB_IN_VHC)/$*.c $@

uspace/app/virtusbhub/main.c

@@ -47 +47 @@
 #include <usbvirt/hub.h>
 
-#include "virthub.h"
+#include "vhc_hub/virthub.h"
 
 #define NAME "vuh"