X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=5955e4a6c43109819baeae863ca616c688dbc4fe;hb=99144c716d7a37efd12cedef46e3e0c406ef1349;hp=1dd5790ebcad447854e56c9c770e063fc82c8157;hpb=05dbb28d6e8613216f43e8d0fae487c1d9c2fcd3;p=nikiroo-utils.git

diff --git a/Makefile b/Makefile
index 1dd5790..5955e4a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,15 @@ ANT_TARGET_DIR = build
 TARGET_DIR = classes
 
 JEXER_SRC = $(SRC_DIR)/jexer/TApplication.java \
+	$(SRC_DIR)/jexer/TAction.java \
+	$(SRC_DIR)/jexer/TButton.java \
+	$(SRC_DIR)/jexer/TLabel.java \
 	$(SRC_DIR)/jexer/TCommand.java \
 	$(SRC_DIR)/jexer/TKeypress.java \
+	$(SRC_DIR)/jexer/TText.java \
+	$(SRC_DIR)/jexer/THScroller.java \
+	$(SRC_DIR)/jexer/TVScroller.java \
+	$(SRC_DIR)/jexer/TWidget.java \
 	$(SRC_DIR)/jexer/bits/GraphicsChars.java \
 	$(SRC_DIR)/jexer/bits/Color.java \
 	$(SRC_DIR)/jexer/bits/CellAttributes.java \
@@ -53,6 +60,10 @@ JEXER_SRC = $(SRC_DIR)/jexer/TApplication.java \
 	$(SRC_DIR)/jexer/event/TMenuEvent.java \
 	$(SRC_DIR)/jexer/event/TMouseEvent.java \
 	$(SRC_DIR)/jexer/event/TResizeEvent.java \
+	$(SRC_DIR)/jexer/menu/TMenu.java \
+	$(SRC_DIR)/jexer/menu/TMenuItem.java \
+	$(SRC_DIR)/jexer/menu/TMenuSeparator.java \
+	$(SRC_DIR)/jexer/menu/TSubMenu.java \
 	$(SRC_DIR)/jexer/session/SessionInfo.java \
 	$(SRC_DIR)/jexer/session/TSessionInfo.java \
 	$(SRC_DIR)/jexer/session/TTYSessionInfo.java \
@@ -60,11 +71,19 @@ JEXER_SRC = $(SRC_DIR)/jexer/TApplication.java \
 	$(SRC_DIR)/jexer/io/ECMA48Screen.java \
 	$(SRC_DIR)/jexer/io/ECMA48Terminal.java \
 	$(SRC_DIR)/jexer/backend/Backend.java \
-	$(SRC_DIR)/jexer/backend/ECMA48Backend.java
+	$(SRC_DIR)/jexer/backend/ECMA48Backend.java \
+	$(SRC_DIR)/jexer/demos/Demo1.java
 
 JEXER_BIN = $(TARGET_DIR)/jexer/TApplication.class \
+	$(TARGET_DIR)/jexer/TAction.class \
+	$(TARGET_DIR)/jexer/TButton.class \
+	$(TARGET_DIR)/jexer/TLabel.class \
 	$(TARGET_DIR)/jexer/TCommand.class \
 	$(TARGET_DIR)/jexer/TKeypress.class \
+	$(TARGET_DIR)/jexer/TText.class \
+	$(TARGET_DIR)/jexer/THScroller.class \
+	$(TARGET_DIR)/jexer/TVScroller.class \
+	$(TARGET_DIR)/jexer/TWidget.class \
 	$(TARGET_DIR)/jexer/bits/GraphicsChars.class \
 	$(TARGET_DIR)/jexer/bits/Color.class \
 	$(TARGET_DIR)/jexer/bits/CellAttributes.class \
@@ -77,6 +96,10 @@ JEXER_BIN = $(TARGET_DIR)/jexer/TApplication.class \
 	$(TARGET_DIR)/jexer/event/TMenuEvent.class \
 	$(TARGET_DIR)/jexer/event/TMouseEvent.class \
 	$(TARGET_DIR)/jexer/event/TResizeEvent.class \
+	$(TARGET_DIR)/jexer/menu/TMenu.class \
+	$(TARGET_DIR)/jexer/menu/TMenuItem.class \
+	$(TARGET_DIR)/jexer/menu/TMenuSeparator.class \
+	$(TARGET_DIR)/jexer/menu/TSubMenu.class \
 	$(TARGET_DIR)/jexer/session/SessionInfo.class \
 	$(TARGET_DIR)/jexer/session/TSessionInfo.class \
 	$(TARGET_DIR)/jexer/session/TTYSessionInfo.class \
@@ -84,30 +107,25 @@ JEXER_BIN = $(TARGET_DIR)/jexer/TApplication.class \
 	$(TARGET_DIR)/jexer/io/ECMA48Screen.class \
 	$(TARGET_DIR)/jexer/io/ECMA48Terminal.class \
 	$(TARGET_DIR)/jexer/backend/Backend.class \
-	$(TARGET_DIR)/jexer/backend/ECMA48Backend.class
+	$(TARGET_DIR)/jexer/backend/ECMA48Backend.class \
+	$(TARGET_DIR)/jexer/demos/Demo1.class
 
 JAVAC = javac
 JAVAFLAGS = -g -deprecation
 
-all:	jexer demos
+all:	jexer
 
 run:	jexer run-demo1
 
-all-demos:	jexer demos/Demo1.class
+all-demos:	jexer
 
-demos/Demo1.class:	demos/Demo1.java
-	$(JAVAC) $(JAVAFLAGS) -cp $(TARGET_DIR) -d demos demos/Demo1.java
+run-demo1:	all-demos
+	java -Djexer.AWT=true -cp $(TARGET_DIR) jexer.demos.Demo1
 
-run-demo1:	demos/Demo1.class
-	java -cp $(TARGET_DIR):demos Demo1
-
-clean:	clean-demos
+clean:
 	-rm -r $(ANT_TARGET_DIR)
 	-rm -r $(TARGET_DIR)
 	-mkdir $(TARGET_DIR)
 
-clean-demos:
-	-rm demos/Demo1.class
-
 jexer:	$(JEXER_SRC)
 	$(JAVAC) $(JAVAFLAGS) -sourcepath $(SRC_DIR) -d $(TARGET_DIR) $(JEXER_SRC)