X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/67ff87bf72a9f6315020c0cd74632631c834ce1b..8d1cb6da6e21302c654da3f09de3975af7e4a11f:/buildlib/program.mak

diff --git a/buildlib/program.mak b/buildlib/program.mak
index 98bea9aa5..1b4a5719a 100644
--- a/buildlib/program.mak
+++ b/buildlib/program.mak
@@ -6,7 +6,7 @@
 # $(SOURCE) - The source code to use
 # $(PROGRAM) - The name of the program
 # $(SLIBS) - Shared libs to link against
-# $(LIB_MAKES) - Shared libary make files to depend on - to ensure we get
+# $(LIB_MAKES) - Shared library make files to depend on - to ensure we get
 # remade when the shared library version increases.
 
 # See defaults.mak for information about LOCAL
@@ -24,6 +24,12 @@ program: $(BIN)/$(PROGRAM)
 clean: clean/$(LOCAL)
 veryclean: veryclean/$(LOCAL)
 
+TYPE = src
+include $(PODOMAIN_H)
+
+# Make Directories
+MKDIRS += $(OBJ) $(DEP) $(BIN)
+
 # The clean rules
 .PHONY: clean/$(LOCAL) veryclean/$(LOCAL) 
 clean/$(LOCAL):
@@ -38,13 +44,13 @@ $(PROGRAM): $($(LOCAL)-BIN)
 # The binary build rule
 $($(LOCAL)-BIN): $($(LOCAL)-OBJS) $($(LOCAL)-MKS)
 	echo Building program $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
+	$(CXX) $(CXXSTD) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) -o $@ '$(abspath $<)'
 	$(DoDep)
 
 # Include the dependencies that are available